[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 14b4e65: Spelling fixes
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 14b4e65: Spelling fixes |
Date: |
Sun, 22 Feb 2015 04:01:10 +0000 |
branch: master
commit 14b4e657e2fd647153b336c61a220acedda8454c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
doc/misc/auth.texi | 4 ++--
lib-src/make-docfile.c | 2 +-
lisp/ChangeLog | 2 +-
lisp/cedet/ChangeLog | 7 +++++++
lisp/cedet/semantic/doc.el | 9 ++++++---
lisp/cedet/srecode/document.el | 2 +-
lisp/emacs-lisp/package.el | 13 ++++++-------
lisp/gnus/ChangeLog | 4 ++--
lisp/org/ChangeLog | 2 +-
src/ChangeLog | 6 ++++++
src/lisp.h | 6 +++---
test/automated/vc-tests.el | 4 ++--
test/cedet/srecode-tests.el | 2 +-
13 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 7c0254a..8dbde4d 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -247,8 +247,8 @@ names:
Your netrc entries will then be:
@example
-machine gmail login account@@gmail.com password "accountpassword" port imap
-machine gmail2 login account2@@gmail.com password "account2password" port imap
+machine gmail login account@@gmail.com password "account password" port imap
+machine gmail2 login account2@@gmail.com password "account2 password" port imap
@end example
@node Secret Service API
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index a7943e3..bada8df 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -743,7 +743,7 @@ write_globals (void)
puts ("#endif");
puts ("#define Qnil builtin_lisp_symbol (0)");
- puts ("#if DEFINE_NONNIL_Q_SYMBOL_MACROS");
+ puts ("#if DEFINE_NON_NIL_Q_SYMBOL_MACROS");
num_symbols = 0;
for (int i = 0; i < num_globals; i++)
if (globals[i].type == SYMBOL && num_symbols++ != 0)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b78dd79..a583d7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -534,7 +534,7 @@
(package--sort-deps-in-alist): New function.
(package-menu-mark-install): Can mark dependencies.
(package--newest-p): New function.
- (package-delete): Don't delesect when deleting an older version of
+ (package-delete): Don't deselect when deleting an older version of
an upgraded package.
* emacs-lisp/package.el: Add missing (require 'subr-x)
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 838a269..c9ddc38 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-22 Paul Eggert <address@hidden>
+
+ Spelling fixes
+ * semantic/doc.el (semantic-documentation-comment-preceding-tag):
+ Rename from semantic-documentation-comment-preceeding-tag. All
+ uses changed. Leave an obsolete alias behind.
+
2015-02-16 Stefan Monnier <address@hidden>
* 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 874763f..3ceb351 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."
doctmp
;; Check just before the definition.
(when (semantic-tag-with-position-p tag)
- (semantic-documentation-comment-preceeding-tag tag nosnarf))
+ (semantic-documentation-comment-preceding-tag tag nosnarf))
;; Let's look for comments either after the definition, but before
code:
;; Not sure yet. Fill in something clever later....
nil))))))
-;; FIXME this is not how you spell "preceding".
-(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf)
+(defun semantic-documentation-comment-preceding-tag (&optional tag nosnarf)
"Find a comment preceding TAG.
If TAG is nil. use the tag under point.
Searches the space between TAG and the preceding tag for a comment,
@@ -84,6 +83,10 @@ just the lexical token and not the string."
;; of a function.
(semantic-doc-snarf-comment-for-tag nosnarf)))
))
+(define-obsolete-function-alias
+ 'semantic-documentation-comment-preceeding-tag
+ 'semantic-documentation-comment-preceding-tag
+ "25.1")
(defun semantic-doc-snarf-comment-for-tag (nosnarf)
"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 9f106a4..4757784 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."
(beginning-of-line)
(forward-char -1)
- (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex))
+ (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))
(doctext
(srecode-document-function-name-comment fcn-in))
)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d8a4fc9..de1158d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -335,11 +335,10 @@ contents of the archive."
:version "24.4")
(defcustom package-selected-packages nil
- "Store here packages installed explicitely by user.
-This variable will be feeded automatically by emacs,
-when installing a new package.
-This variable will be used by `package-autoremove' to decide
-which packages are no more needed.
+ "Store here packages installed explicitly by user.
+This variable is fed automatically by Emacs when installing a new package.
+This variable is used by `package-autoremove' to decide
+which packages are no longer needed.
You can use it to (re)install packages on other machines
by running `package-user-selected-packages-install'.
@@ -1280,7 +1279,7 @@ to install it but still mark it as selected."
;;;###autoload
(defun package-reinstall (pkg)
"Reinstall package PKG.
-PKG shoul be either a symbol, the package name, or a package-desc
+PKG should be either a symbol, the package name, or a package-desc
object."
(interactive (list (intern (completing-read
"Reinstall package: "
@@ -1547,7 +1546,7 @@ If NOSAVE is non-nil, the package is not removed from
;; `package-selected-packages' even if it can't be deleted.
(when (and (null nosave)
(package--user-selected-p name)
- ;; Don't delesect if this is an older version of an
+ ;; Don't deselect if this is an older version of an
;; upgraded package.
(package--newest-p pkg-desc))
(customize-save-variable
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7895f37..07d1d47 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -827,7 +827,7 @@
2014-01-30 Lars Ingebrigtsen <address@hidden>
* nnmail.el (nnmail-split-it): Instead of redoing the search to restore
- the match data, just save and restore it explictly (bug#12375).
+ the match data, just save and restore it explicitly (bug#12375).
* gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if
that's needed.
@@ -24084,7 +24084,7 @@
(spam-ham-copy-or-move-routine): Return the number of processed
ham messages.
(spam-summary-prepare-exit): Use the above values to decide
- whether status messages shouled be displayed.
+ whether status messages should be displayed.
2004-05-20 Katsumi Yamaoka <address@hidden>
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 081da5d..ce39bb7 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -852,7 +852,7 @@
in a table.el table last.
* org.el (org-delete-property): Don't suggest to delete the
- CATEGORY property when the category is not explicitely set in the
+ CATEGORY property when the category is not explicitly set in the
property drawer. Also enforce matching when completing.
(org-insert-heading): Fix regression: with two universal prefixes,
insert heading at the end of the subtree.
diff --git a/src/ChangeLog b/src/ChangeLog
index 8604cfc..5e4dbb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-22 Paul Eggert <address@hidden>
+
+ Spelling fixes
+ * lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS):
+ Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS. All uses changed.
+
2015-02-21 Eli Zaretskii <address@hidden>
* w32term.c (queue_notifications):
diff --git a/src/lisp.h b/src/lisp.h
index 7795c90..9764b09 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -746,10 +746,10 @@ struct Lisp_Symbol
/* By default, define macros for Qt, etc., as this leads to a bit
better performance in the core Emacs interpreter. A plugin can
- define DEFINE_NONNIL_Q_SYMBOL_MACROS to be false, to be portable to
+ define DEFINE_NON_NIL_Q_SYMBOL_MACROS to be false, to be portable to
other Emacs instances that assign different values to Qt, etc. */
-#ifndef DEFINE_NONNIL_Q_SYMBOL_MACROS
-# define DEFINE_NONNIL_Q_SYMBOL_MACROS true
+#ifndef DEFINE_NON_NIL_Q_SYMBOL_MACROS
+# define DEFINE_NON_NIL_Q_SYMBOL_MACROS true
#endif
#include "globals.h"
diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el
index e83eb85..4d9aefa 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."
(let ((tmp-name (expand-file-name "foo" default-directory)))
;; Check for initial state, should be nil until it's registered.
- ;; Don't pass the backend explictly, otherwise some implementations
- ;; return non-nil.
+ ;; Don't pass the backend explicitly, otherwise some
+ ;; implementations return non-nil.
(should (null (vc-working-revision tmp-name)))
;; Write a new file. Check state.
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el
index 423df72..f7529ec 100644
--- a/test/cedet/srecode-tests.el
+++ b/test/cedet/srecode-tests.el
@@ -272,7 +272,7 @@ Dump out the extracted dictionary."
(not (semantic-tag-of-class-p fcn-in 'function)))
(error "No tag of class 'function to insert comment for"))
- (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex))
+ (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))
)
(when (not lextok)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 14b4e65: Spelling fixes,
Paul Eggert <=