aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-02 20:49:04 -0700
committerGlenn Morris2010-11-02 20:49:04 -0700
commit537b04b96a8516693acabd5474791f5c77a770d4 (patch)
tree74411a3837610730fad60042b727c5126844a38b
parentcf503f7c08c73b89485ac3d00af917875ed13b39 (diff)
downloademacs-537b04b96a8516693acabd5474791f5c77a770d4.tar.gz
emacs-537b04b96a8516693acabd5474791f5c77a770d4.zip
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.
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/ediff.texi7
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/checkdoc.el3
-rw-r--r--lisp/mh-e/ChangeLog.16
-rw-r--r--lisp/net/dbus.el3
-rw-r--r--lisp/textmodes/reftex-index.el3
-rw-r--r--lisp/textmodes/reftex-toc.el3
-rw-r--r--lisp/vc/ediff-util.el3
-rw-r--r--lisp/x-dnd.el3
-rw-r--r--src/font.c15
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 @@
12010-11-03 Glenn Morris <rgm@gnu.org> 12010-11-03 Glenn Morris <rgm@gnu.org>
2 2
3 * ediff.texi (Quick Help Commands, Miscellaneous):
3 * gnus.texi (Agent Variables): Spelling fix. 4 * gnus.texi (Agent Variables): Spelling fix.
4 5
52010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org> 62010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
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.
759You can then restart any of these sessions by either clicking on a session 759You can then restart any of these sessions by either clicking on a session
760record or by putting the cursor over it and then typing the return key. 760record or by putting the cursor over it and then typing the return key.
761 761
762(Some poor souls leave so many active Ediff sessions around that they loose 762(Some poor souls leave so many active Ediff sessions around that they lose
763track of them completely... The `R' command is designed to save these 763track of them completely... The `R' command is designed to save these
764people from the recently discovered Ediff Proficiency Syndrome.) 764people from the recently discovered Ediff Proficiency Syndrome.)
765 765
@@ -2315,7 +2315,7 @@ other behavior.
2315 2315
2316However, Ediff temporarily resets this variable to @code{t} if it is 2316However, Ediff temporarily resets this variable to @code{t} if it is
2317invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. 2317invoked via one of the "buffer" jobs, such as @code{ediff-buffers}.
2318This is because it is all too easy to loose day's work otherwise. 2318This is because it is all too easy to lose a day's work otherwise.
2319Besides, in a "buffer" job, the variant buffers have already been loaded 2319Besides, in a "buffer" job, the variant buffers have already been loaded
2320prior to starting Ediff, so Ediff just preserves status quo here. 2320prior to starting Ediff, so Ediff just preserves status quo here.
2321 2321
@@ -2542,6 +2542,3 @@ Eli Zaretskii (eliz at is.elta.co.il)
2542 2542
2543@bye 2543@bye
2544 2544
2545@ignore
2546 arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46
2547@end ignore
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d70a55ec02b..4413266a18b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-11-03 Glenn Morris <rgm@gnu.org> 12010-11-03 Glenn Morris <rgm@gnu.org>
2 2
3 * net/dbus.el (dbus-name-owner-changed-handler): Doc fix.
4
3 * play/landmark.el (lm-losing-threshold): Correct spelling. 5 * play/landmark.el (lm-losing-threshold): Correct spelling.
4 (lm-human-plays): Use new name. 6 (lm-human-plays): Use new name.
5 7
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
1388regexp short cuts work. FP is the function defun information." 1388regexp short cuts work. FP is the function defun information."
1389 (let ((case-fold-search nil) 1389 (let ((case-fold-search nil)
1390 ;; Use a marker so if an early check modifies the text, 1390 ;; Use a marker so if an early check modifies the text,
1391 ;; we won't accidentally loose our place. This could cause 1391 ;; we won't accidentally lose our place. This could cause
1392 ;; end-of doc string whitespace to also delete the " char. 1392 ;; end-of doc string whitespace to also delete the " char.
1393 (s (point)) 1393 (s (point))
1394 (e (if (looking-at "\"") 1394 (e (if (looking-at "\"")
@@ -2676,5 +2676,4 @@ function called to create the messages."
2676 2676
2677(provide 'checkdoc) 2677(provide 'checkdoc)
2678 2678
2679;; arch-tag: c49a7ec8-3bb7-46f2-bfbc-d5f26e033b26
2680;;; checkdoc.el ends here 2679;;; 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 @@
5452 from mh-exec-cmd. 5452 from mh-exec-cmd.
5453 5453
5454 * mh-utils.el (mh-temp-folders-buffer): Sequences and folders 5454 * mh-utils.el (mh-temp-folders-buffer): Sequences and folders
5455 loose the -temp from their buffer names as they are interesting to 5455 lose the -temp from their buffer names as they are interesting to
5456 the user. 5456 the user.
5457 5457
5458 * mh-seq.el (mh-list-sequences): New name, mh-sequences-buffer as 5458 * mh-seq.el (mh-list-sequences): New name, mh-sequences-buffer as
@@ -11400,7 +11400,8 @@
11400 (dist): Leave release in current directory. 11400 (dist): Leave release in current directory.
11401 11401
11402 11402
11403 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 11403 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
11404 Free Software Foundation, Inc.
11404 11405
11405 This file is part of GNU Emacs. 11406 This file is part of GNU Emacs.
11406 11407
@@ -11417,4 +11418,3 @@
11417 You should have received a copy of the GNU General Public License 11418 You should have received a copy of the GNU General Public License
11418 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 11419 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
11419 11420
11420;; 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
239arrived. SERVICE is the object name for which the name owner has 239arrived. SERVICE is the object name for which the name owner has
240been changed. OLD-OWNER is the previous owner of SERVICE, or the 240been changed. OLD-OWNER is the previous owner of SERVICE, or the
241empty string if SERVICE was not owned yet. NEW-OWNER is the new 241empty string if SERVICE was not owned yet. NEW-OWNER is the new
242owner of SERVICE, or the empty string if SERVICE looses any name owner. 242owner of SERVICE, or the empty string if SERVICE loses any name owner.
243 243
244usage: (dbus-name-owner-changed-handler service old-owner new-owner)" 244usage: (dbus-name-owner-changed-handler service old-owner new-owner)"
245 (save-match-data 245 (save-match-data
@@ -1010,5 +1010,4 @@ It will be registered for all objects created by `dbus-register-object'."
1010 1010
1011(provide 'dbus) 1011(provide 'dbus)
1012 1012
1013;; arch-tag: a47caf84-9162-4811-90cc-5d388e37b9bd
1014;;; dbus.el ends here 1013;;; 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."
1699 (let* ((lines (split-string (buffer-substring beg end) "\n")) 1699 (let* ((lines (split-string (buffer-substring beg end) "\n"))
1700 (lines1 (sort lines 'reftex-compare-phrase-lines))) 1700 (lines1 (sort lines 'reftex-compare-phrase-lines)))
1701 (message "Sorting lines...done") 1701 (message "Sorting lines...done")
1702 (let ((inhibit-quit t)) ;; make sure we do not loose lines 1702 (let ((inhibit-quit t)) ;; make sure we do not lose lines
1703 (delete-region beg end) 1703 (delete-region beg end)
1704 (insert (mapconcat 'identity lines1 "\n")))) 1704 (insert (mapconcat 'identity lines1 "\n"))))
1705 (goto-char (point-max)) 1705 (goto-char (point-max))
@@ -2104,5 +2104,4 @@ Does not do a save-excursion."
2104 ["Save and Return" reftex-index-phrases-save-and-return t])) 2104 ["Save and Return" reftex-index-phrases-save-and-return t]))
2105 2105
2106 2106
2107;; arch-tag: 4b2362af-c156-42c1-8932-ea2823e205c1
2108;;; reftex-index.el ends here 2107;;; 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."
678 (error "Something is wrong! Contact maintainer!"))) 678 (error "Something is wrong! Contact maintainer!")))
679 ;; Section has changed, request scan and loading 679 ;; Section has changed, request scan and loading
680 ;; We use a variable to delay until after the safe-exc. 680 ;; We use a variable to delay until after the safe-exc.
681 ;; because otherwise we loose the region. 681 ;; because otherwise we lose the region.
682 (setq load t))) 682 (setq load t)))
683 ;; Scan document and load all files, this exits command 683 ;; Scan document and load all files, this exits command
684 (if load (reftex-toc-load-all-files-for-promotion))) ; exits 684 (if load (reftex-toc-load-all-files-for-promotion))) ; exits
@@ -1100,5 +1100,4 @@ always show the current section in connection with the option
1100 ["Help" reftex-toc-show-help t])) 1100 ["Help" reftex-toc-show-help t]))
1101 1101
1102 1102
1103;; arch-tag: 92400ce2-0b86-4c89-a606-4ed71acea17e
1104;;; reftex-toc.el ends here 1103;;; 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.")
311 ediff-word-mode-job (ediff-word-mode-job)) 311 ediff-word-mode-job (ediff-word-mode-job))
312 312
313 ;; Don't delete variants in case of ediff-buffer-* jobs without asking. 313 ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
314 ;; This is because one may loose work---dangerous. 314 ;; This is because one may lose work---dangerous.
315 (if (string-match "buffer" (symbol-name ediff-job-name)) 315 (if (string-match "buffer" (symbol-name ediff-job-name))
316 (setq ediff-keep-variants t)) 316 (setq ediff-keep-variants t))
317 317
@@ -4289,5 +4289,4 @@ Mail anyway? (y or n) ")
4289;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) 4289;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
4290;; End: 4290;; End:
4291 4291
4292;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879
4293;;; ediff-util.el ends here 4292;;; 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.
220DATA is encoded in utf-16. Decode the URL and call `x-dnd-handle-uri-list'." 220DATA is encoded in utf-16. Decode the URL and call `x-dnd-handle-uri-list'."
221 ;; Mozilla and applications based on it (Galeon for example) uses 221 ;; Mozilla and applications based on it (Galeon for example) uses
222 ;; text/unicode, but it is impossible to tell if it is le or be. Use what 222 ;; text/unicode, but it is impossible to tell if it is le or be. Use what
223 ;; the machine Emacs runs on use. This looses if dropping between machines 223 ;; the machine Emacs runs on use. This loses if dropping between machines
224 ;; with different endian, but it is the best we can do. 224 ;; with different endian, but it is the best we can do.
225 (let* ((coding (if (eq (byteorder) ?B) 'utf-16be 'utf-16le)) 225 (let* ((coding (if (eq (byteorder) ?B) 'utf-16be 'utf-16le))
226 (string (decode-coding-string data coding)) 226 (string (decode-coding-string data coding))
@@ -766,5 +766,4 @@ FORMAT is 32 (not used). MESSAGE is the data part of an XClientMessageEvent."
766 766
767(provide 'x-dnd) 767(provide 'x-dnd)
768 768
769;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
770;;; x-dnd.el ends here 769;;; 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 @@
1/* font.c -- "Font" primitives. 1/* font.c -- "Font" primitives.
2 Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 2
3 Copyright (C) 2006, 2007, 2008, 2009, 2010 3Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4 National Institute of Advanced Industrial Science and Technology (AIST) 4Copyright (C) 2006, 2007, 2008, 2009, 2010
5 Registration Number H13PRO009 5 National Institute of Advanced Industrial Science and Technology (AIST)
6 Registration Number H13PRO009
6 7
7This file is part of GNU Emacs. 8This file is part of GNU Emacs.
8 9
@@ -3443,7 +3444,7 @@ font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec)
3443 if (NILP (entity)) 3444 if (NILP (entity))
3444 return Qnil; 3445 return Qnil;
3445 } 3446 }
3446 /* Don't loose the original name that was put in initially. We need 3447 /* Don't lose the original name that was put in initially. We need
3447 it to re-apply the font when font parameters (like hinting or dpi) have 3448 it to re-apply the font when font parameters (like hinting or dpi) have
3448 changed. */ 3449 changed. */
3449 entity = font_open_for_lface (f, entity, attrs, spec); 3450 entity = font_open_for_lface (f, entity, attrs, spec);
@@ -3514,7 +3515,7 @@ font_open_by_name (FRAME_PTR f, const char *name)
3514 args[1] = make_unibyte_string (name, strlen (name)); 3515 args[1] = make_unibyte_string (name, strlen (name));
3515 spec = Ffont_spec (2, args); 3516 spec = Ffont_spec (2, args);
3516 ret = font_open_by_spec (f, spec); 3517 ret = font_open_by_spec (f, spec);
3517 /* Do not loose name originally put in. */ 3518 /* Do not lose name originally put in. */
3518 if (!NILP (ret)) 3519 if (!NILP (ret))
3519 font_put_extra (ret, QCuser_spec, args[1]); 3520 font_put_extra (ret, QCuser_spec, args[1]);
3520 3521
@@ -5399,5 +5400,3 @@ init_font (void)
5399 Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; 5400 Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt;
5400} 5401}
5401 5402
5402/* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846
5403 (do not change this comment) */