From 537b04b96a8516693acabd5474791f5c77a770d4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Nov 2010 20:49:04 -0700 Subject: [PATCH] Don't be so lax with spelling. * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix. --- doc/misc/ChangeLog | 1 + doc/misc/ediff.texi | 7 ++----- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/checkdoc.el | 3 +-- lisp/mh-e/ChangeLog.1 | 6 +++--- lisp/net/dbus.el | 3 +-- lisp/textmodes/reftex-index.el | 3 +-- lisp/textmodes/reftex-toc.el | 3 +-- lisp/vc/ediff-util.el | 3 +-- lisp/x-dnd.el | 3 +-- src/font.c | 15 +++++++-------- 11 files changed, 21 insertions(+), 28 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e5b2fa62836..a58775595fc 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,6 @@ 2010-11-03 Glenn Morris + * ediff.texi (Quick Help Commands, Miscellaneous): * gnus.texi (Agent Variables): Spelling fix. 2010-10-31 Lars Magne Ingebrigtsen diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 4259fccb390..c2897e185bf 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -759,7 +759,7 @@ Displays a list of currently active Ediff sessions---the Ediff Registry. You can then restart any of these sessions by either clicking on a session record or by putting the cursor over it and then typing the return key. -(Some poor souls leave so many active Ediff sessions around that they loose +(Some poor souls leave so many active Ediff sessions around that they lose track of them completely... The `R' command is designed to save these people from the recently discovered Ediff Proficiency Syndrome.) @@ -2315,7 +2315,7 @@ other behavior. However, Ediff temporarily resets this variable to @code{t} if it is invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. -This is because it is all too easy to loose day's work otherwise. +This is because it is all too easy to lose a day's work otherwise. Besides, in a "buffer" job, the variant buffers have already been loaded prior to starting Ediff, so Ediff just preserves status quo here. @@ -2542,6 +2542,3 @@ Eli Zaretskii (eliz at is.elta.co.il) @bye -@ignore - arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46 -@end ignore diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d70a55ec02b..4413266a18b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-11-03 Glenn Morris + * net/dbus.el (dbus-name-owner-changed-handler): Doc fix. + * play/landmark.el (lm-losing-threshold): Correct spelling. (lm-human-plays): Use new name. diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 9acad6e67cb..5e4b0dc96c6 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1388,7 +1388,7 @@ Depends on `checkdoc-this-string-valid' to reset the syntax table so that regexp short cuts work. FP is the function defun information." (let ((case-fold-search nil) ;; Use a marker so if an early check modifies the text, - ;; we won't accidentally loose our place. This could cause + ;; we won't accidentally lose our place. This could cause ;; end-of doc string whitespace to also delete the " char. (s (point)) (e (if (looking-at "\"") @@ -2676,5 +2676,4 @@ function called to create the messages." (provide 'checkdoc) -;; arch-tag: c49a7ec8-3bb7-46f2-bfbc-d5f26e033b26 ;;; checkdoc.el ends here diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index a24489ca9b7..7492f9600b3 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -5452,7 +5452,7 @@ from mh-exec-cmd. * mh-utils.el (mh-temp-folders-buffer): Sequences and folders - loose the -temp from their buffer names as they are interesting to + lose the -temp from their buffer names as they are interesting to the user. * mh-seq.el (mh-list-sequences): New name, mh-sequences-buffer as @@ -11400,7 +11400,8 @@ (dist): Leave release in current directory. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -11417,4 +11418,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . -;; arch-tag: 2577172b-b1bf-4d87-acfb-c9d8780e8851 diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8d9512d6f9f..c9adec5d7b8 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -239,7 +239,7 @@ This handler is applied when a \"NameOwnerChanged\" signal has arrived. SERVICE is the object name for which the name owner has been changed. OLD-OWNER is the previous owner of SERVICE, or the empty string if SERVICE was not owned yet. NEW-OWNER is the new -owner of SERVICE, or the empty string if SERVICE looses any name owner. +owner of SERVICE, or the empty string if SERVICE loses any name owner. usage: (dbus-name-owner-changed-handler service old-owner new-owner)" (save-match-data @@ -1010,5 +1010,4 @@ It will be registered for all objects created by `dbus-register-object'." (provide 'dbus) -;; arch-tag: a47caf84-9162-4811-90cc-5d388e37b9bd ;;; dbus.el ends here diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index dee7a319260..2da5897827d 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1699,7 +1699,7 @@ it first compares the macro identifying chars and then the phrases." (let* ((lines (split-string (buffer-substring beg end) "\n")) (lines1 (sort lines 'reftex-compare-phrase-lines))) (message "Sorting lines...done") - (let ((inhibit-quit t)) ;; make sure we do not loose lines + (let ((inhibit-quit t)) ;; make sure we do not lose lines (delete-region beg end) (insert (mapconcat 'identity lines1 "\n")))) (goto-char (point-max)) @@ -2104,5 +2104,4 @@ Does not do a save-excursion." ["Save and Return" reftex-index-phrases-save-and-return t])) -;; arch-tag: 4b2362af-c156-42c1-8932-ea2823e205c1 ;;; reftex-index.el ends here diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 41ea83b077f..4d9be61de3d 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -678,7 +678,7 @@ promotion/demotion later." (error "Something is wrong! Contact maintainer!"))) ;; Section has changed, request scan and loading ;; We use a variable to delay until after the safe-exc. - ;; because otherwise we loose the region. + ;; because otherwise we lose the region. (setq load t))) ;; Scan document and load all files, this exits command (if load (reftex-toc-load-all-files-for-promotion))) ; exits @@ -1100,5 +1100,4 @@ always show the current section in connection with the option ["Help" reftex-toc-show-help t])) -;; arch-tag: 92400ce2-0b86-4c89-a606-4ed71acea17e ;;; reftex-toc.el ends here diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index b36599249a5..4eec5577e7b 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -311,7 +311,7 @@ to invocation.") ediff-word-mode-job (ediff-word-mode-job)) ;; Don't delete variants in case of ediff-buffer-* jobs without asking. - ;; This is because one may loose work---dangerous. + ;; This is because one may lose work---dangerous. (if (string-match "buffer" (symbol-name ediff-job-name)) (setq ediff-keep-variants t)) @@ -4289,5 +4289,4 @@ Mail anyway? (y or n) ") ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) ;; End: -;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879 ;;; ediff-util.el ends here diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index c589382e014..f071bc49b74 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -220,7 +220,7 @@ The first string is the URL, the second string is the title of that URL. DATA is encoded in utf-16. Decode the URL and call `x-dnd-handle-uri-list'." ;; Mozilla and applications based on it (Galeon for example) uses ;; text/unicode, but it is impossible to tell if it is le or be. Use what - ;; the machine Emacs runs on use. This looses if dropping between machines + ;; the machine Emacs runs on use. This loses if dropping between machines ;; with different endian, but it is the best we can do. (let* ((coding (if (eq (byteorder) ?B) 'utf-16be 'utf-16le)) (string (decode-coding-string data coding)) @@ -766,5 +766,4 @@ FORMAT is 32 (not used). MESSAGE is the data part of an XClientMessageEvent." (provide 'x-dnd) -;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621 ;;; x-dnd.el ends here diff --git a/src/font.c b/src/font.c index aee6b483353..c08c211199c 100644 --- a/src/font.c +++ b/src/font.c @@ -1,8 +1,9 @@ /* font.c -- "Font" primitives. - Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - Copyright (C) 2006, 2007, 2008, 2009, 2010 - National Institute of Advanced Industrial Science and Technology (AIST) - Registration Number H13PRO009 + +Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. @@ -3443,7 +3444,7 @@ font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec) if (NILP (entity)) return Qnil; } - /* Don't loose the original name that was put in initially. We need + /* Don't lose the original name that was put in initially. We need it to re-apply the font when font parameters (like hinting or dpi) have changed. */ entity = font_open_for_lface (f, entity, attrs, spec); @@ -3514,7 +3515,7 @@ font_open_by_name (FRAME_PTR f, const char *name) args[1] = make_unibyte_string (name, strlen (name)); spec = Ffont_spec (2, args); ret = font_open_by_spec (f, spec); - /* Do not loose name originally put in. */ + /* Do not lose name originally put in. */ if (!NILP (ret)) font_put_extra (ret, QCuser_spec, args[1]); @@ -5399,5 +5400,3 @@ init_font (void) Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; } -/* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846 - (do not change this comment) */ -- 2.11.4.GIT