aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-02-21 20:00:16 -0800
committerPaul Eggert2015-02-21 20:01:05 -0800
commit14b4e657e2fd647153b336c61a220acedda8454c (patch)
tree47791e6fdda122dfa30768827da6151906c2350e
parent1cb34285463d2b9050a031a7f9a53d376de5b489 (diff)
downloademacs-14b4e657e2fd647153b336c61a220acedda8454c.tar.gz
emacs-14b4e657e2fd647153b336c61a220acedda8454c.zip
Spelling fixes
* lisp/cedet/semantic/doc.el (semantic-documentation-comment-preceding-tag): Rename from semantic-documentation-comment-preceeding-tag. All uses changed. Leave an obsolete alias behind. * src/lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS): Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS. All uses changed.
-rw-r--r--doc/misc/auth.texi4
-rw-r--r--lib-src/make-docfile.c2
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/cedet/ChangeLog7
-rw-r--r--lisp/cedet/semantic/doc.el9
-rw-r--r--lisp/cedet/srecode/document.el2
-rw-r--r--lisp/emacs-lisp/package.el13
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--src/ChangeLog6
-rw-r--r--src/lisp.h6
-rw-r--r--test/automated/vc-tests.el4
-rw-r--r--test/cedet/srecode-tests.el2
13 files changed, 39 insertions, 24 deletions
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 7c0254a9a3a..8dbde4d5ea0 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -247,8 +247,8 @@ names:
247Your netrc entries will then be: 247Your netrc entries will then be:
248 248
249@example 249@example
250machine gmail login account@@gmail.com password "accountpassword" port imap 250machine gmail login account@@gmail.com password "account password" port imap
251machine gmail2 login account2@@gmail.com password "account2password" port imap 251machine gmail2 login account2@@gmail.com password "account2 password" port imap
252@end example 252@end example
253 253
254@node Secret Service API 254@node Secret Service API
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index a7943e3118c..bada8df9f72 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -743,7 +743,7 @@ write_globals (void)
743 puts ("#endif"); 743 puts ("#endif");
744 744
745 puts ("#define Qnil builtin_lisp_symbol (0)"); 745 puts ("#define Qnil builtin_lisp_symbol (0)");
746 puts ("#if DEFINE_NONNIL_Q_SYMBOL_MACROS"); 746 puts ("#if DEFINE_NON_NIL_Q_SYMBOL_MACROS");
747 num_symbols = 0; 747 num_symbols = 0;
748 for (int i = 0; i < num_globals; i++) 748 for (int i = 0; i < num_globals; i++)
749 if (globals[i].type == SYMBOL && num_symbols++ != 0) 749 if (globals[i].type == SYMBOL && num_symbols++ != 0)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b78dd7920ae..a583d7c58e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -534,7 +534,7 @@
534 (package--sort-deps-in-alist): New function. 534 (package--sort-deps-in-alist): New function.
535 (package-menu-mark-install): Can mark dependencies. 535 (package-menu-mark-install): Can mark dependencies.
536 (package--newest-p): New function. 536 (package--newest-p): New function.
537 (package-delete): Don't delesect when deleting an older version of 537 (package-delete): Don't deselect when deleting an older version of
538 an upgraded package. 538 an upgraded package.
539 539
540 * emacs-lisp/package.el: Add missing (require 'subr-x) 540 * emacs-lisp/package.el: Add missing (require 'subr-x)
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 838a2693491..c9ddc382d50 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,10 @@
12015-02-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Spelling fixes
4 * semantic/doc.el (semantic-documentation-comment-preceding-tag):
5 Rename from semantic-documentation-comment-preceeding-tag. All
6 uses changed. Leave an obsolete alias behind.
7
12015-02-16 Stefan Monnier <monnier@iro.umontreal.ca> 82015-02-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * semantic/db-el.el (semanticdb-elisp-sym->tag): Fix copy&paste error 10 * semantic/db-el.el (semanticdb-elisp-sym->tag): Fix copy&paste error
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index 874763f0a7f..3ceb3510ad2 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -56,13 +56,12 @@ If nosnarf if 'lex, then only return the lex token."
56 doctmp 56 doctmp
57 ;; Check just before the definition. 57 ;; Check just before the definition.
58 (when (semantic-tag-with-position-p tag) 58 (when (semantic-tag-with-position-p tag)
59 (semantic-documentation-comment-preceeding-tag tag nosnarf)) 59 (semantic-documentation-comment-preceding-tag tag nosnarf))
60 ;; Let's look for comments either after the definition, but before code: 60 ;; Let's look for comments either after the definition, but before code:
61 ;; Not sure yet. Fill in something clever later.... 61 ;; Not sure yet. Fill in something clever later....
62 nil)))))) 62 nil))))))
63 63
64;; FIXME this is not how you spell "preceding". 64(defun semantic-documentation-comment-preceding-tag (&optional tag nosnarf)
65(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf)
66 "Find a comment preceding TAG. 65 "Find a comment preceding TAG.
67If TAG is nil. use the tag under point. 66If TAG is nil. use the tag under point.
68Searches the space between TAG and the preceding tag for a comment, 67Searches the space between TAG and the preceding tag for a comment,
@@ -84,6 +83,10 @@ just the lexical token and not the string."
84 ;; of a function. 83 ;; of a function.
85 (semantic-doc-snarf-comment-for-tag nosnarf))) 84 (semantic-doc-snarf-comment-for-tag nosnarf)))
86 )) 85 ))
86(define-obsolete-function-alias
87 'semantic-documentation-comment-preceeding-tag
88 'semantic-documentation-comment-preceding-tag
89 "25.1")
87 90
88(defun semantic-doc-snarf-comment-for-tag (nosnarf) 91(defun semantic-doc-snarf-comment-for-tag (nosnarf)
89 "Snarf up the comment at POINT for `semantic-documentation-for-tag'. 92 "Snarf up the comment at POINT for `semantic-documentation-for-tag'.
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 9f106a40660..47577844c74 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -395,7 +395,7 @@ It is assumed that the comment occurs just in front of FCN-IN."
395 (beginning-of-line) 395 (beginning-of-line)
396 (forward-char -1) 396 (forward-char -1)
397 397
398 (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex)) 398 (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))
399 (doctext 399 (doctext
400 (srecode-document-function-name-comment fcn-in)) 400 (srecode-document-function-name-comment fcn-in))
401 ) 401 )
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d8a4fc9c846..de1158d96a7 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -335,11 +335,10 @@ contents of the archive."
335 :version "24.4") 335 :version "24.4")
336 336
337(defcustom package-selected-packages nil 337(defcustom package-selected-packages nil
338 "Store here packages installed explicitely by user. 338 "Store here packages installed explicitly by user.
339This variable will be feeded automatically by emacs, 339This variable is fed automatically by Emacs when installing a new package.
340when installing a new package. 340This variable is used by `package-autoremove' to decide
341This variable will be used by `package-autoremove' to decide 341which packages are no longer needed.
342which packages are no more needed.
343You can use it to (re)install packages on other machines 342You can use it to (re)install packages on other machines
344by running `package-user-selected-packages-install'. 343by running `package-user-selected-packages-install'.
345 344
@@ -1280,7 +1279,7 @@ to install it but still mark it as selected."
1280;;;###autoload 1279;;;###autoload
1281(defun package-reinstall (pkg) 1280(defun package-reinstall (pkg)
1282 "Reinstall package PKG. 1281 "Reinstall package PKG.
1283PKG shoul be either a symbol, the package name, or a package-desc 1282PKG should be either a symbol, the package name, or a package-desc
1284object." 1283object."
1285 (interactive (list (intern (completing-read 1284 (interactive (list (intern (completing-read
1286 "Reinstall package: " 1285 "Reinstall package: "
@@ -1547,7 +1546,7 @@ If NOSAVE is non-nil, the package is not removed from
1547 ;; `package-selected-packages' even if it can't be deleted. 1546 ;; `package-selected-packages' even if it can't be deleted.
1548 (when (and (null nosave) 1547 (when (and (null nosave)
1549 (package--user-selected-p name) 1548 (package--user-selected-p name)
1550 ;; Don't delesect if this is an older version of an 1549 ;; Don't deselect if this is an older version of an
1551 ;; upgraded package. 1550 ;; upgraded package.
1552 (package--newest-p pkg-desc)) 1551 (package--newest-p pkg-desc))
1553 (customize-save-variable 1552 (customize-save-variable
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7895f378b82..07d1d471b9f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -827,7 +827,7 @@
8272014-01-30 Lars Ingebrigtsen <larsi@gnus.org> 8272014-01-30 Lars Ingebrigtsen <larsi@gnus.org>
828 828
829 * nnmail.el (nnmail-split-it): Instead of redoing the search to restore 829 * nnmail.el (nnmail-split-it): Instead of redoing the search to restore
830 the match data, just save and restore it explictly (bug#12375). 830 the match data, just save and restore it explicitly (bug#12375).
831 831
832 * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if 832 * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if
833 that's needed. 833 that's needed.
@@ -24084,7 +24084,7 @@
24084 (spam-ham-copy-or-move-routine): Return the number of processed 24084 (spam-ham-copy-or-move-routine): Return the number of processed
24085 ham messages. 24085 ham messages.
24086 (spam-summary-prepare-exit): Use the above values to decide 24086 (spam-summary-prepare-exit): Use the above values to decide
24087 whether status messages shouled be displayed. 24087 whether status messages should be displayed.
24088 24088
240892004-05-20 Katsumi Yamaoka <yamaoka@jpl.org> 240892004-05-20 Katsumi Yamaoka <yamaoka@jpl.org>
24090 24090
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 081da5db73b..ce39bb7d568 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -852,7 +852,7 @@
852 in a table.el table last. 852 in a table.el table last.
853 853
854 * org.el (org-delete-property): Don't suggest to delete the 854 * org.el (org-delete-property): Don't suggest to delete the
855 CATEGORY property when the category is not explicitely set in the 855 CATEGORY property when the category is not explicitly set in the
856 property drawer. Also enforce matching when completing. 856 property drawer. Also enforce matching when completing.
857 (org-insert-heading): Fix regression: with two universal prefixes, 857 (org-insert-heading): Fix regression: with two universal prefixes,
858 insert heading at the end of the subtree. 858 insert heading at the end of the subtree.
diff --git a/src/ChangeLog b/src/ChangeLog
index 8604cfcb29f..5e4dbb7ae1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12015-02-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Spelling fixes
4 * lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS):
5 Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS. All uses changed.
6
12015-02-21 Eli Zaretskii <eliz@gnu.org> 72015-02-21 Eli Zaretskii <eliz@gnu.org>
2 8
3 * w32term.c (queue_notifications): 9 * w32term.c (queue_notifications):
diff --git a/src/lisp.h b/src/lisp.h
index 7795c90e5cc..9764b096ef0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -746,10 +746,10 @@ struct Lisp_Symbol
746 746
747/* By default, define macros for Qt, etc., as this leads to a bit 747/* By default, define macros for Qt, etc., as this leads to a bit
748 better performance in the core Emacs interpreter. A plugin can 748 better performance in the core Emacs interpreter. A plugin can
749 define DEFINE_NONNIL_Q_SYMBOL_MACROS to be false, to be portable to 749 define DEFINE_NON_NIL_Q_SYMBOL_MACROS to be false, to be portable to
750 other Emacs instances that assign different values to Qt, etc. */ 750 other Emacs instances that assign different values to Qt, etc. */
751#ifndef DEFINE_NONNIL_Q_SYMBOL_MACROS 751#ifndef DEFINE_NON_NIL_Q_SYMBOL_MACROS
752# define DEFINE_NONNIL_Q_SYMBOL_MACROS true 752# define DEFINE_NON_NIL_Q_SYMBOL_MACROS true
753#endif 753#endif
754 754
755#include "globals.h" 755#include "globals.h"
diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el
index e83eb85c0fe..4d9aefad7fb 100644
--- a/test/automated/vc-tests.el
+++ b/test/automated/vc-tests.el
@@ -331,8 +331,8 @@ For backends which dont support it, `vc-not-supported' is signalled."
331 331
332 (let ((tmp-name (expand-file-name "foo" default-directory))) 332 (let ((tmp-name (expand-file-name "foo" default-directory)))
333 ;; Check for initial state, should be nil until it's registered. 333 ;; Check for initial state, should be nil until it's registered.
334 ;; Don't pass the backend explictly, otherwise some implementations 334 ;; Don't pass the backend explicitly, otherwise some
335 ;; return non-nil. 335 ;; implementations return non-nil.
336 (should (null (vc-working-revision tmp-name))) 336 (should (null (vc-working-revision tmp-name)))
337 337
338 ;; Write a new file. Check state. 338 ;; Write a new file. Check state.
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el
index 423df72d5ac..f7529ecb5e3 100644
--- a/test/cedet/srecode-tests.el
+++ b/test/cedet/srecode-tests.el
@@ -272,7 +272,7 @@ Dump out the extracted dictionary."
272 (not (semantic-tag-of-class-p fcn-in 'function))) 272 (not (semantic-tag-of-class-p fcn-in 'function)))
273 (error "No tag of class 'function to insert comment for")) 273 (error "No tag of class 'function to insert comment for"))
274 274
275 (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex)) 275 (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))
276 ) 276 )
277 277
278 (when (not lextok) 278 (when (not lextok)