From ee7683ebb70c308e596103e379ef6b91d001eebc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Nov 2011 23:03:56 -0800 Subject: Spelling fixes. --- lisp/cedet/semantic/analyze.el | 2 +- lisp/cedet/semantic/analyze/fcn.el | 2 +- lisp/cedet/semantic/complete.el | 2 +- lisp/cedet/semantic/ia-sb.el | 2 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/sort.el | 2 +- lisp/cedet/semantic/symref.el | 2 +- lisp/cedet/semantic/symref/list.el | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index ae199703c80..c275ba96ee4 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -254,7 +254,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error (fname nil) (miniscope (when scope (clone scope))) ) - ;; First order check. Is this wholely contained in the typecache? + ;; First order check. Is this wholly contained in the typecache? (setq tmp (semanticdb-typecache-find sequence)) (if tmp diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el index eae6d013400..967e5c59cda 100644 --- a/lisp/cedet/semantic/analyze/fcn.el +++ b/lisp/cedet/semantic/analyze/fcn.el @@ -157,7 +157,7 @@ Almost all searches use the same arguments." ;; (define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration) - ;; todo - move into typecahe!! + ;; todo - move into typecache!! "Return a concrete type tag based on input TYPE tag. A concrete type is an actual declaration of a memory description, such as a structure, or class. A meta type is an alias, diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index aaec4cb30ff..7e01b88f60b 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1023,7 +1023,7 @@ Output must be in semanticdb Find result format." (defmethod semantic-collector-try-completion-whitespace ((obj semantic-collector-abstract) prefix) - "For OBJ, do whatepsace completion based on PREFIX. + "For OBJ, do whitespace completion based on PREFIX. This implies that if there are two completions, one matching the test \"prefix\\>\", and one not, the one matching the full word version of PREFIX will be chosen, and that text returned. diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index 95a68673b8c..edd62cc5ca5 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el @@ -348,7 +348,7 @@ TEXT TAG and INDENT are the details." (insert (semantic-tag-name tag)) (if movepoint (setq movepoint (point))) ;; I'd like to use this to add fancy () or what not at the end - ;; but we need the parent file whih requires an upgrade to the + ;; but we need the parent file which requires an upgrade to the ;; analysis tool. ;;(semantic-insert-foreign-tag tag ??)) ) diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 03a3f1b0cb1..9cbea4430e0 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -452,7 +452,7 @@ continue processing recursively." ;; If val is nil, that's probably wrong. ;; Found a system header case where this was true. ((null val) "") - ;; Debug wierd stuff. + ;; Debug weird stuff. (t (debug))) )) ((stringp txt) diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el index c3d8b26810c..a4126e1384b 100644 --- a/lisp/cedet/semantic/sort.el +++ b/lisp/cedet/semantic/sort.el @@ -229,7 +229,7 @@ unmodified as components of their parent tags." (mapc (lambda (tag) (let ((components (semantic-tag-components tag))) (if (and components - ;; unpositined tags can be hazardous to + ;; unpositioned tags can be hazardous to ;; completion. Do we need any type of tag ;; here? - EL (semantic-tag-with-position-p (car components))) diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el index 61006802c0d..cbae9f85573 100644 --- a/lisp/cedet/semantic/symref.el +++ b/lisp/cedet/semantic/symref.el @@ -324,7 +324,7 @@ Use the `semantic-symref-hit-tags' method to get this list.") (setq ans (list (car files)) files (cdr files)) (dolist (F files) - ;; This algorithm for uniqing the file list depends on the + ;; This algorithm for uniquifying the file list depends on the ;; tool in question providing all the hits in the same file ;; grouped together. (when (not (string= F (car ans))) diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index ce3500f83e1..53422541c47 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -401,7 +401,7 @@ BUTTON is the button that was clicked." ;;; UTILS ;; -;; List mode utils for understadning the current line +;; List mode utils for understanding the current line (defun semantic-symref-list-on-hit-p () "Return the line number if the cursor is on a buffer line with a hit. -- cgit v1.2.3 From 20db1522fe719b5de3f7cf9b373183d4b3437e94 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 24 Nov 2011 02:58:14 +0100 Subject: Fix typos. --- ChangeLog | 4 ++ configure.in | 2 +- doc/emacs/ChangeLog | 4 ++ doc/emacs/display.texi | 2 +- lisp/ChangeLog | 17 ++++++++ lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/allout.el | 94 ++++++++++++++++++++--------------------- lisp/cedet/ChangeLog | 4 ++ lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/gnus/ChangeLog | 8 +++- lisp/gnus/gnus-group.el | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/obsolete/fast-lock.el | 2 +- lisp/org/ChangeLog | 4 ++ lisp/org/ob.el | 2 +- lisp/progmodes/cc-cmds.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/verilog-mode.el | 2 +- lisp/textmodes/bibtex.el | 4 +- lisp/vc/cvs-status.el | 2 +- lisp/wdired.el | 2 +- lisp/window.el | 2 +- lwlib/lwlib.c | 6 +-- src/ChangeLog.11 | 2 +- src/msdos.c | 2 +- 28 files changed, 110 insertions(+), 73 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/ChangeLog b/ChangeLog index 0232a3f8415..a3cfbd55db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * configure.in (HAVE_XPM): Fix typo. + 2011-11-22 Glenn Morris * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can diff --git a/configure.in b/configure.in index 890b20e7b3f..8b70ed59900 100644 --- a/configure.in +++ b/configure.in @@ -2436,7 +2436,7 @@ no_return_alloc_pixels fi if test "${HAVE_XPM}" = "yes"; then - AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).]) + AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).]) LIBXPM=-lXpm fi fi diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e27c778679c..abf0c86d1cf 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * display.texi (Font Lock): Fix typo. + 2011-11-24 Glenn Morris * rmail.texi (Rmail Output): diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 8995b1242b1..a7ecc0dc551 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -762,7 +762,7 @@ relies on analysis of the syntactic structure of the buffer text. For the sake of speed, some modes, including Lisp mode, rely on a special convention: an open-parenthesis or open-brace in the leftmost column always defines the beginning of a defun, and is thus always outside -any string or comment. Therefore, you should avoid placing a an +any string or comment. Therefore, you should avoid placing an open-parenthesis or open-brace in the leftmost column, if it is inside a string or comment. @xref{Left Margin Paren}, for details. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ba307a377f..8902a714ab9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2011-11-24 Juanma Barranquero + + * allout.el (allout-setup, allout-auto-save-temporarily-disabled) + (allout-lead-with-comment-string, allout-structure-deleted-hook) + (allout-mode, allout-chart-subtree, allout-hotspot-key-handler) + (allout-rebullet-heading, allout-open-sibtopic) + (allout-toggle-current-subtree-encryption) + (allout-toggle-subtree-encryption, allout-encrypt-string) + (allout-next-topic-pending-encryption, allout-adjust-file-variable) + (allout-distinctive-bullets-string, allout-auto-activation): + * window.el (window-normalize-buffer-to-display): + * progmodes/verilog-mode.el (verilog-batch-indent): + * textmodes/bibtex.el (bibtex-field-braces-opt) + (bibtex-field-strings-opt): + * vc/cvs-status.el (cvs-tree-merge): + Fix typos. + 2011-11-23 Michael Albinus * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 2b384d79169..57a9a7b026a 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -11362,7 +11362,7 @@ * blackbox.el (bb-init-board): Use (random 8) to get # in [0,7]. * dissociate.el: Likewise. * fill.el (justify-current-line): Likewise. - * flame.el (define-element, psychoanalize-flamer): Likewise. + * flame.el (define-element, psychoanalyze-flamer): Likewise. * yow.el (yow): Likewise. * doctor.el: Use (random N), not (random-range N). (random-range): Function deleted. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 7419ccc1241..1c38b4d9ac6 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -2021,7 +2021,7 @@ newbuffile out of the loop, in the newbuffile-nd local var. Use dolist (cosmetic change). Compute the proposed name for the most common case and cache it in the fourth place in the item. - (uniquify-rationalize-file-buffer-names): Used to return a a list + (uniquify-rationalize-file-buffer-names): Used to return a list of buffer whose name was changed, but that return value was never used. (uniquify-item-lessp): Replaces uniquify-filename-lessp, works on the cached proposed name, does much less consing and is quicker. diff --git a/lisp/allout.el b/lisp/allout.el index e699c85c7b8..47db77f2bbc 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -279,7 +279,7 @@ Intended to be used as the `allout-auto-activation' :set function." ;;;_ > allout-setup () ;;;###autoload (defun allout-setup () - "Do fundamental emacs session for allout auto-activation. + "Do fundamental Emacs session for allout auto-activation. Establishes allout processing as part of visiting a file if `allout-auto-activation' is non-nil, or removes it otherwise. @@ -298,7 +298,7 @@ Control whether and how allout outline mode is automatically activated when files are visited with non-nil buffer-specific file variable `allout-layout'. -When allout-auto-activation is \"On\" \(t), allout mode is +When allout-auto-activation is \"On\" (t), allout mode is activated in buffers with non-nil `allout-layout', and the specified layout is applied. @@ -560,7 +560,7 @@ of this var to take effect." These bullets are distinguish topics with particular character. They are not used by default in the topic creation routines, but are offered as options when you modify topic creation with a -universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]). +universal argument (\\[universal-argument]), or during rebulleting (\\[allout-rebullet-current-heading]). Distinctive bullets are not cycled when topics are shifted or otherwise automatically rebulleted, so their marking is @@ -844,7 +844,7 @@ such topics are encrypted.)" (defvar allout-auto-save-temporarily-disabled nil "True while topic encryption is pending and auto-saving was active. -The value of buffer-saved-size at the time of decryption is used, +The value of `buffer-saved-size' at the time of decryption is used, for restoring when all encryptions are established.") (defvar allout-just-did-undo nil "True just after undo commands, until allout-post-command-business.") @@ -910,7 +910,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring." (defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL -- see docstring. "Buffer-specific setting for allout layout. -In buffers where this is non-nil \(and if `allout-auto-activation' +In buffers where this is non-nil (and if `allout-auto-activation' has been customized to enable this behavior), `allout-mode' will be automatically activated. The layout dictated by the value will be used to set the initial exposure when `allout-mode' is activated. @@ -1037,7 +1037,7 @@ suitably economical.") (defun allout-lead-with-comment-string (&optional header-lead) "Set the topic-header leading string to specified string. -Useful when for encapsulating outline structure in programming +Useful for encapsulating outline structure in programming language comments. Returns the leading string." (interactive "P") @@ -1440,7 +1440,7 @@ Functions on the hook must take two arguments: - DEPTH -- integer indicating the depth of the subtree that was deleted. - REMOVED-FROM -- integer indicating the point where the subtree was removed. -Some edits that remove or invalidate items may missed by this hook: +Some edits that remove or invalidate items may be missed by this hook: specifically edits that native allout routines do not control. This hook might be invoked multiple times by a single command.") @@ -1472,10 +1472,10 @@ that was affected by the undo. Functions on the hook should not require any arguments.") ;;;_ = allout-outside-normal-auto-fill-function (defvar allout-outside-normal-auto-fill-function nil - "Value of normal-auto-fill-function outside of allout mode. + "Value of `normal-auto-fill-function' outside of allout mode. -Used by allout-auto-fill to do the mandated normal-auto-fill-function -wrapped within allout's automatic fill-prefix setting.") +Used by `allout-auto-fill' to do the mandated `normal-auto-fill-function' +wrapped within allout's automatic `fill-prefix' setting.") (make-variable-buffer-local 'allout-outside-normal-auto-fill-function) ;;;_ = prevent redundant activation by desktop mode: (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil)) @@ -1576,7 +1576,7 @@ message if an error is encountered. The message will serve as a non-nil return on `write-contents-functions' to prevent saving of the buffer while it has decrypted content. -This behavior depends on emacs versions that implement the +This behavior depends on Emacs versions that implement the `write-contents-functions' hook." (if (or (not (allout-mode-p)) @@ -1627,7 +1627,7 @@ and the place for the cursor after the decryption is done." ) ;;;_ > allout-called-interactively-p () (defmacro allout-called-interactively-p () - "A version of called-interactively-p independent of emacs version." + "A version of `called-interactively-p' independent of Emacs version." ;; ... to ease maintenance of allout without betraying deprecation. (if (equal (subr-arity (symbol-function 'called-interactively-p)) '(0 . 0)) @@ -1712,7 +1712,7 @@ Allout outline mode is a minor mode that provides extensive outline oriented formatting and manipulation. It enables structural editing of outlines, as well as navigation and exposure. It also is specifically aimed at accommodating -syntax-sensitive text like programming languages. \(For example, +syntax-sensitive text like programming languages. (For example, see the allout code itself, which is organized as an allout outline.) @@ -1733,7 +1733,7 @@ Below is a description of the key bindings, and then description of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features. Customize `allout-auto-activation' to prepare your -emacs session for automatic activation of `allout-mode'. +Emacs session for automatic activation of `allout-mode'. The bindings are those listed in `allout-prefixed-keybindings' and `allout-unprefixed-keybindings'. We recommend customizing @@ -1781,7 +1781,7 @@ the HOT-SPOT Operation section. \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for current topic \\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and - its' offspring -- distinctive bullets are not changed, others + its offspring -- distinctive bullets are not changed, others are alternated according to nesting depth. \\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -- the offspring are not affected. @@ -1791,12 +1791,12 @@ the HOT-SPOT Operation section. ---------------------------------- \\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. -\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-kill-line] `allout-kill-line' Kill line, attending to outline structure. \\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. \\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to depth of heading if yanking into bare topic heading (ie, prefix sans text). -\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank +\\[allout-yank-pop] `allout-yank-pop' Is to `allout-yank' as `yank-pop' is to `yank'. Topic-oriented Encryption: ------------------------- @@ -1836,7 +1836,7 @@ for a save, it is automatically decrypted for continued editing. NOTE: A few GnuPG v2 versions improperly preserve incorrect symmetric decryption keys, preventing entry of the correct key on subsequent decryption attempts until the cache times-out. That -can take several minutes. \(Decryption of other entries is not +can take several minutes. (Decryption of other entries is not affected.) Upgrade your EasyPG version, if you can, and you can deliberately clear your gpg-agent's cache by sending it a '-HUP' signal. @@ -1877,7 +1877,7 @@ hooks, by which independent code can cooperate with allout without changes to the allout core. Here are key ones: `allout-mode-hook' -`allout-mode-deactivate-hook' \(deprecated) +`allout-mode-deactivate-hook' (deprecated) `allout-mode-off-hook' `allout-exposure-change-hook' `allout-structure-added-hook' @@ -1939,7 +1939,7 @@ PREFIX-LEAD: When the PREFIX-LEAD is set to the comment-string of a programming language, outline structuring can be embedded in program code without interfering with processing of the text - (by emacs or the language processor) as program code. This + (by Emacs or the language processor) as program code. This setting happens automatically when allout mode is used in programming-mode buffers. See `allout-use-mode-specific-leader' docstring for more detail. @@ -1951,7 +1951,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of `allout-distinctive-bullets-string'. When creating a TOPIC, plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you - provide a universal argugment \(\\[universal-argument]) to the + provide a universal argument (\\[universal-argument]) to the TOPIC creation command, or when explictly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for @@ -2250,7 +2250,7 @@ to return the current prefix." allout-recent-prefix-end)) ;;;_ > allout-recent-bullet () (defmacro allout-recent-bullet () - "Like allout-recent-prefix, but returns bullet of last encountered prefix. + "Like `allout-recent-prefix', but returns bullet of last encountered prefix. All outline functions which directly do string matches to assess headings set the variables `allout-recent-prefix-beginning' and @@ -2625,13 +2625,13 @@ The remaining optional args are for internal use by the function. Point is left at the end of the subtree. Charts are used to capture outline structure, so that outline-altering -routines need assess the structure only once, and then use the chart +routines need to assess the structure only once, and then use the chart for their elaborate manipulations. The chart entries for the topics are in reverse order, so the last topic is listed first. The entry for each topic consists of an integer indicating the point at the beginning of the topic -prefix. Charts for offspring consists of a list containing, +prefix. Charts for offspring consist of a list containing, recursively, the charts for the respective subtopics. The chart for a topics' offspring precedes the entry for the topic itself. @@ -3186,7 +3186,7 @@ Presumes point is at the start of a topic prefix." (if (allout-called-interactively-p) (allout-end-of-prefix))))) ;;;_ > allout-next-visible-heading (arg) (defun allout-next-visible-heading (arg) - "Move to the next ARG'th visible heading line, backward if arg is negative. + "Move to the next ARGth visible heading line, backward if ARG is negative. Move to buffer limit in indicated direction if headings are exhausted." @@ -3388,8 +3388,8 @@ return to regular interpretation of self-insert characters." "Catchall handling of key bindings in hot-spots. Translates unmodified keystrokes to corresponding allout commands, when -they would qualify if prefixed with the allout-command-prefix, and sets -this-command accordingly. +they would qualify if prefixed with the `allout-command-prefix', and sets +`this-command' accordingly. Returns the qualifying command, if any, else nil." (interactive) @@ -3533,7 +3533,7 @@ the current topics' depth. If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a \(numeric) character, then character's string representation is used +- a (numeric) character, then character's string representation is used - a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default @@ -3849,7 +3849,7 @@ Nuances: (defun allout-open-subtopic (arg) "Open new topic header at deeper level than the current one. -Negative universal arg means to open deeper, but place the new topic +Negative universal ARG means to open deeper, but place the new topic prior to the current one." (interactive "p") (allout-open-topic 1 (> 0 arg) (< 1 arg))) @@ -3857,9 +3857,9 @@ prior to the current one." (defun allout-open-sibtopic (arg) "Open new topic header at same level as the current one. -Positive universal arg means to use the bullet of the prior sibling. +Positive universal ARG means to use the bullet of the prior sibling. -Negative universal arg means to place the new topic prior to the current +Negative universal ARG means to place the new topic prior to the current one." (interactive "p") (allout-open-topic 0 (> 0 arg) (not (= 1 arg)))) @@ -3867,7 +3867,7 @@ one." (defun allout-open-supertopic (arg) "Open new topic header at shallower level than the current one. -Negative universal arg means to open shallower, but place the new +Negative universal ARG means to open shallower, but place the new topic prior to the current one." (interactive "p") @@ -3992,7 +3992,7 @@ All args are optional. If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a \(numeric) character, then character's string representation is used +- a (numeric) character, then character's string representation is used - a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default @@ -4033,7 +4033,7 @@ this function." number-control index))) - ;; Is new one is identical to old? + ;; Is new one identical to old? (if (and (= current-depth new-depth) (string= current-bullet (substring new-prefix (1- (length new-prefix))))) @@ -4407,7 +4407,7 @@ subtopics into siblings of the item." (run-hook-with-args 'allout-structure-deleted-hook depth (point)))))) ;;;_ > allout-copy-line-as-kill () (defun allout-copy-line-as-kill () - "Like allout-kill-topic, but save to kill ring instead of deleting." + "Like `allout-kill-topic', but save to kill ring instead of deleting." (interactive) (let ((buffer-read-only t)) (condition-case nil @@ -5854,12 +5854,12 @@ With repeat count, copy the exposed portions of entire buffer." (defun allout-toggle-current-subtree-encryption (&optional keymode-cue) "Encrypt clear or decrypt encoded topic text. -Allout uses emacs 'epg' libary to perform encryption. Symmetric +Allout uses Emacs 'epg' library to perform encryption. Symmetric and keypair encryption are supported. All encryption is ascii armored. Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -5881,7 +5881,7 @@ pending encryption or encrypted. `*' asterisk immediately after the bullet signals that the body is encrypted, its absence means the topic is meant to be encrypted but is not currently. When a file with topics pending encryption is saved, topics pending -encryption are encrypted. See allout-encrypt-unencrypted-on-saves +encryption are encrypted. See `allout-encrypt-unencrypted-on-saves' for auto-encryption specifics. \*NOTE WELL* that automatic encryption that happens during saves will @@ -5900,7 +5900,7 @@ encrypted. If you want to encrypt the contents of a top-level topic, use "Encrypt clear text or decrypt encoded topic contents (body and subtopics.) Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -5916,7 +5916,7 @@ associated with it. This can be used to deassociate any recipients with the file, by selecting no recipients in the dialog. -Encryption and decryption uses the emacs epg library. +Encryption and decryption uses the Emacs 'epg' library. Encrypted text will be ascii-armored. @@ -6033,7 +6033,7 @@ If DECRYPT is true (default false), then decrypt instead of encrypt. ALLOUT-BUFFER identifies the buffer containing the text. Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -6057,7 +6057,7 @@ rejections due to matches against NOTE: A few GnuPG v2 versions improperly preserve incorrect symmetric decryption keys, preventing entry of the correct key on subsequent decryption attempts until the cache times-out. That -can take several minutes. \(Decryption of other entries is not +can take several minutes. (Decryption of other entries is not affected.) Upgrade your EasyPG version, if you can, and you can deliberately clear your gpg-agent's cache by sending it a '-HUP' signal." @@ -6196,7 +6196,7 @@ signal." (defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size) "Temporarily prevent auto-saves in this buffer when an item is decrypted. -WAS-BUFFER-SAVED-SIZE is the value of buffer-saved-size *before* +WAS-BUFFER-SAVED-SIZE is the value of `buffer-saved-size' *before* the decryption." (when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1))) (setq allout-auto-save-temporarily-disabled was-buffer-saved-size @@ -6229,8 +6229,8 @@ the decryption." "Return the point of the next topic pending encryption, or nil if none. Such a topic has the `allout-topic-encryption-bullet' without an -immediately following '*' that would mark the topic as being encrypted. It -must also have content." +immediately following '*' that would mark the topic as being encrypted. +It must also have content." (let (done got content-beg) (save-match-data (while (not done) @@ -6332,7 +6332,7 @@ save. See `allout-encrypt-unencrypted-on-saves' for more info." "Activate outline mode and establish file var so it is started subsequently. See `allout-layout' and customization of `allout-auto-activation' -for details on preparing emacs for automatic allout activation." +for details on preparing Emacs for automatic allout activation." (interactive "P") @@ -6380,7 +6380,7 @@ Returns a list of the form (BEGINNING-POINT PREFIX-STRING SUFFIX-STRING)." (defun allout-adjust-file-variable (varname value) "Adjust the setting of an Emacs file variable named VARNAME to VALUE. -This activity is inhibited if either `enable-local-variables' +This activity is inhibited if either `enable-local-variables' or `allout-enable-file-variable-adjustment' are nil. When enabled, an entry for the variable is created if not already present, diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 788bf71845f..6b56e20df13 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * semantic/lex-spp.el (semantic-lex-spp-first-token-arg-list): Fix typo. + 2011-11-20 Juanma Barranquero * cedet-cscope.el (cedet-cscope-version-check): diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 686113c23e2..fe659d118e1 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -298,7 +298,7 @@ Moves completely over balanced #if blocks." ;; @TODO - can we use the new c-scan-conditionals (c-forward-conditional 1)) ((looking-at "^\\s-*#\\s-*elif") - ;; We need to let the preprocessor analize this one. + ;; We need to let the preprocessor analyze this one. (beginning-of-line) (setq done t) ) diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 9cbea4430e0..cf82da303ce 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -821,7 +821,7 @@ STR occurs in the current buffer between BEG and END." ;; a macro. (defun semantic-lex-spp-first-token-arg-list (token) - "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST." + "If TOKEN is a semantic-list, turn it into an SPP ARG LIST." (when (and (consp token) (symbolp (car token)) (eq 'semantic-list (car token))) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9c05fab048e..2b144529de1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * gnus-group.el (gnus-group-highlight): Fix typo. + 2011-11-24 Adam W (tiny change) * mail-source.el (mail-source-fetch-maildir): Don't expect the return @@ -2277,7 +2281,7 @@ * gnus-art.el (gnus-article-next-page-1): Because customized mode-line face with line-width greater than zero will cause RET in gnus summary buffer to scroll down article page-wise because auto vscroll happens, - it should be temporalily disabled when doing a scroll-up. + it should be temporally disabled when doing a scroll-up. 2011-02-19 Lars Ingebrigtsen @@ -11700,7 +11704,7 @@ (nntp-open-marks): Decode group names when bootstrapping marks. * rfc2047.el (rfc2047-encode-message-header): Make XEmacs decode - Newsgroups and Folowup-To headers. + Newsgroups and Followup-To headers. 2007-07-13 Katsumi Yamaoka diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 6f146644115..9d358969062 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -362,7 +362,7 @@ If you want to modify the group buffer, you can use this hook." gnus-group-news-low)) "*Controls the highlighting of group buffer lines. -Below is a list of `Form'/`Face' pairs. When deciding how a a +Below is a list of `Form'/`Face' pairs. When deciding how a particular group line should be displayed, each form is evaluated. The content of the face field after the first true form is used. You can change how those group lines are displayed by diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 15eb1cbaed7..1c0f3ff6300 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -2553,7 +2553,7 @@ for users who have customized it to a long list now redundant with `mh-invisible-header-fields-default'. (mh-invisible-header-fields-default-override): New defcustom. - Users check off the fields they want displyed from what we + Users check off the fields they want displayed from what we included in `mh-invisible-header-fields-default'. (mh-invisible-headers): Function adapted to new variables. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index f6a5b53ae7f..48502540e29 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -5995,7 +5995,7 @@ Other orders of $ and _ seem to all work just fine.") (concat pubset (and userid (concat userid ".")) - ;; change every '/' in filename to a '.', normally not neccessary + ;; change every '/' in filename to a '.', normally not necessary (and filename (subst-char-in-string ?/ ?. filename))))) ;; Let's hope that BS2000 recognize this anyway: diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 9c750ca5e89..c42c2309413 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -144,7 +144,7 @@ ;; 3.07--3.08: ;; - Made `fast-lock-read-cache' set `fast-lock-cache-filename' ;; 3.08--3.09: -;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is an a list +;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is a list ;; - Made `fast-lock-mode' respect the value of `font-lock-inhibit-thing-lock' ;; - Added `fast-lock-after-unfontify-buffer' ;; 3.09--3.10: diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index aa96fa1a4d1..94346a4944a 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * ob.el (org-babel-execute-src-block): Fix typo. + 2011-11-20 Juanma Barranquero * org.el (org-link-unescape, org-link-unescape-compound): Fix typos. diff --git a/lisp/org/ob.el b/lisp/org/ob.el index 728c6c5cb5e..f34d1fbda9e 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -380,7 +380,7 @@ Insert the results of execution into the buffer. Source code execution and the collection and formatting of results can be controlled through a variety of header arguments. -With prefix argument ARG, force re-execution even if a an +With prefix argument ARG, force re-execution even if an existing result cached in the buffer would otherwise have been returned. diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 1eaf8910d14..8e4ac92d96f 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2316,7 +2316,7 @@ function does not require the declaration to contain a brace block." (defun c-after-statement-terminator-p () ; Should we pass in LIM here? ;; Does point immediately follow a statement "terminator"? A virtual - ;; semicolon is regarded here as such. So is a an opening brace ;-) + ;; semicolon is regarded here as such. So is an opening brace ;-) ;; ;; This function might do hidden buffer changes. (or (save-excursion diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 527bc51eef8..854cc664b30 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1745,7 +1745,7 @@ and source-file directory for your debugger." ;; All the .java files in the directories in gud-jdb-directories are ;; syntactically analyzed each time gud jdb is invoked. It would be ;; nice to keep as much information as possible between runs. It would -;; be really nice to analyze the files only as neccessary (when the +;; be really nice to analyze the files only as necessary (when the ;; source needs to be displayed.) I'm not sure to what extent the former ;; can be accomplished and I'm not sure the latter can be done at all ;; since I don't know of any general way to tell which .class files are diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 4cc4a133c8e..3570a2cfa3e 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -4627,7 +4627,7 @@ line in bottom-up order." (verilog-batch-execute-func `verilog-inject-auto)) (defun verilog-batch-indent () - "For use with --batch, reindent an a entire file as a stand-alone tool. + "For use with --batch, reindent an entire file as a stand-alone tool. This sets up the appropriate Verilog mode environment, calls \\[verilog-indent-buffer] on all command-line files, and saves the buffers." (unless noninteractive diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index c9b1c44eb91..8df2e81c723 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1451,12 +1451,12 @@ Set this variable before loading BibTeX mode." (defvar bibtex-field-braces-opt nil "Optimized value of `bibtex-field-braces-alist'. Created by `bibtex-field-re-init'. -It is a an alist with elements (FIELD . REGEXP).") +It is an alist with elements (FIELD . REGEXP).") (defvar bibtex-field-strings-opt nil "Optimized value of `bibtex-field-strings-alist'. Created by `bibtex-field-re-init'. -It is a an alist with elements (FIELD RULE1 RULE2 ...), +It is an alist with elements (FIELD RULE1 RULE2 ...), where each RULE is (REGEXP . TO-STR).") (defvar bibtex-pop-previous-search-point nil diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index 063eb414579..3444b230e8d 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el @@ -257,7 +257,7 @@ The tree will be printed no closer than column COLUMN." (defun cvs-tree-merge (tree1 tree2) "Merge tags trees TREE1 and TREE2 into one. -BEWARE: because of stability issues, this is not a symetric operation." +BEWARE: because of stability issues, this is not a symmetric operation." (assert (and (listp tree1) (listp tree2))) (cond ((null tree1) tree2) diff --git a/lisp/wdired.el b/lisp/wdired.el index cc99bd40628..b9c07d15ae8 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -32,7 +32,7 @@ ;; the files in a "dired" buffer? Now you can do this. All the power ;; of Emacs commands are available to renaming files! ;; -;; This package provides a function that makes the filenames of a a +;; This package provides a function that makes the filenames of a ;; dired buffer editable, by changing the buffer mode (which inhibits ;; all of the commands of dired mode). Here you can edit the names of ;; one or more files and directories, and when you press C-c C-c, the diff --git a/lisp/window.el b/lisp/window.el index 2885c3a5c70..ad611bbba56 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4522,7 +4522,7 @@ The actual non-nil value of this variable will be copied to the (defun window-normalize-buffer-to-display (buffer-or-name) "Normalize BUFFER-OR-NAME argument for buffer display functions. -If BUFFER-OR-NAME is nil, return the curent buffer. Else, if a +If BUFFER-OR-NAME is nil, return the current buffer. Else, if a buffer specified by BUFFER-OR-NAME exists, return that buffer. If no such buffer exists, create a buffer with the name BUFFER-OR-NAME and return that buffer." diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 7e3538aec04..b83517ad1f9 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -1156,9 +1156,9 @@ lw_get_widget_value_for_widget (widget_instance *instance, Widget w) /* To forbid recursive calls */ static Boolean lwlib_updating; -/* This function can be used as a an XtCallback for the widgets that get - modified to update other instances of the widgets. Closure should be the - widget_instance. */ +/* This function can be used as an XtCallback for the widgets that get + modified to update other instances of the widgets. Closure should be the + widget_instance. */ void lw_internal_update_other_instances (Widget widget, XtPointer closure, diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 72871475b69..cb8b413a514 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -2191,7 +2191,7 @@ 2010-12-16 Jan Djärv * nsterm.m (ns_draw_window_cursor): If the cursor color is the - same as the background, use the face forground as cursor. + same as the background, use the face foreground as cursor. 2010-12-13 Eli Zaretskii diff --git a/src/msdos.c b/src/msdos.c index 4c08c5b29e0..64e9d72c784 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1558,7 +1558,7 @@ IT_set_terminal_window (struct frame *f, int foo) { } -/* Remember the screen colors of the curent frame, to serve as the +/* Remember the screen colors of the current frame, to serve as the default colors for newly-created frames. */ DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors, Smsdos_remember_default_colors, 1, 1, 0, -- cgit v1.2.3 From e4920bc99dfcee02c3bb83b46a761b0893f76626 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 24 Nov 2011 23:14:48 -0800 Subject: Spelling fixes. --- admin/ChangeLog | 4 +-- doc/lispintro/emacs-lisp-intro.texi | 2 +- doc/lispref/text.texi | 4 +-- doc/misc/ChangeLog | 2 +- doc/misc/autotype.texi | 4 +-- doc/misc/gnus.texi | 4 +-- doc/misc/message.texi | 2 +- doc/misc/org.texi | 6 ++-- doc/misc/semantic.texi | 2 +- doc/misc/ses.texi | 2 +- doc/misc/tramp.texi | 2 +- etc/MH-E-NEWS | 2 +- leim/quail/ethiopic.el | 2 +- leim/quail/tibetan.el | 6 ++-- lisp/ChangeLog.10 | 2 +- lisp/ChangeLog.12 | 4 +-- lisp/ChangeLog.3 | 3 +- lisp/ChangeLog.8 | 2 +- lisp/cedet/ede/files.el | 2 +- lisp/cedet/ede/proj-shared.el | 4 +-- lisp/cedet/semantic/grammar.el | 6 ++-- lisp/cedet/semantic/lex.el | 4 +-- lisp/cedet/semantic/senator.el | 4 +-- lisp/color.el | 4 +-- lisp/follow.el | 2 +- lisp/gnus/ChangeLog | 2 +- lisp/gnus/gmm-utils.el | 2 +- lisp/gnus/gnus-group.el | 4 +-- lisp/gnus/gnus-topic.el | 2 +- lisp/gnus/mm-decode.el | 2 +- lisp/gnus/rfc2047.el | 4 +-- lisp/gnus/starttls.el | 2 +- lisp/help.el | 2 +- lisp/international/mule.el | 4 +-- lisp/international/titdic-cnv.el | 66 ++++++++++++++++++------------------- lisp/language/ethio-util.el | 2 +- lisp/language/tibet-util.el | 2 +- lisp/language/tibetan.el | 4 +-- lisp/ldefs-boot.el | 2 +- lisp/mh-e/ChangeLog | 3 +- lisp/net/eudc-export.el | 2 +- lisp/net/secrets.el | 2 +- lisp/net/tramp-gvfs.el | 4 +-- lisp/net/xesam.el | 2 +- lisp/org/ChangeLog | 2 +- lisp/printing.el | 6 ++-- lisp/progmodes/cperl-mode.el | 2 +- lisp/vc/ediff-util.el | 4 +-- lisp/w32-fns.el | 2 +- src/ChangeLog.10 | 2 +- src/ChangeLog.8 | 2 +- src/callint.c | 2 +- src/ccl.c | 2 +- src/cm.h | 2 +- src/fringe.c | 2 +- src/process.c | 2 +- 56 files changed, 110 insertions(+), 114 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/admin/ChangeLog b/admin/ChangeLog index aa815c552b4..94cf71162df 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -897,11 +897,11 @@ * FOR-RELEASE (NEW FEATURES): Completed work on this item: Rework how fringe bitmaps are defined and used. - Currently, bitmap usage and bitmap appearence are "mixed-up" in a + Currently, bitmap usage and bitmap appearance are "mixed-up" in a one-level representation. It would be cleaner to split the representation into a two-level model where first level maps bitmap usage to a bitmap name, and second level maps bitmap name to - a bitmap appearence. + a bitmap appearance. 2006-01-27 Chong Yidong diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 7d1a1186c0a..23d0d5a8f34 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -2040,7 +2040,7 @@ the first argument. This function takes three arguments. Its first argument is the string of characters, the second and third arguments are numbers that indicate the beginning and end of the substring. The numbers are a count of the number of characters (including spaces and -punctuations) from the beginning of the string. +punctuation) from the beginning of the string. @need 800 For example, if you evaluate the following: diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 3a081dddc61..f320b386445 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3762,7 +3762,7 @@ Additionally, if two fields are separated by another field with the special value @code{boundary}, then any point within this special field is also considered to be ``on the boundary.'' -Commands like @kbd{C-a} with no argumemt, that normally move backward +Commands like @kbd{C-a} with no argument, that normally move backward to a specific kind of location and stay there once there, probably should specify @code{nil} for @var{escape-from-edge}. Other motion commands that check fields should probably pass @code{t}. @@ -4322,5 +4322,3 @@ If you do want modification hooks to be run in a particular piece of code that is itself run from a modification hook, then rebind locally @code{inhibit-modification-hooks} to @code{nil}. @end defvar - - diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 02befc69d4a..57e7dd5871a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -7982,7 +7982,7 @@ 2003-02-01 Michael Albinus * tramp.texi (Frequently Asked Questions): Explain a workaround if - another package loads accidently Ange-FTP. + another package loads accidentally Ange-FTP. 2003-01-24 Michael Albinus diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index ecf4c7e47b2..289c08eb00e 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -419,7 +419,7 @@ inserting something. When this is @code{nil}, inserting is only done with @kbd{M-x auto-insert}. When this is @code{function}, you are queried whenever @code{auto-insert} is called as a function, such as when Emacs visits an empty file and you have set the above-mentioned hook. Otherwise -you are alway queried. +you are always queried. @vindex auto-insert-prompt When querying, the variable @code{auto-insert-prompt}'s value is used as a @@ -510,7 +510,7 @@ inserting or updating the magic number. When this is @code{nil} updating is only done with @kbd{M-x executable-set-magic}. When this is @code{function} you are queried whenever @code{executable-set-magic} is called as a function, such as when Emacs puts a buffer in Shell script -mode. Otherwise you are alway queried. +mode. Otherwise you are always queried. @findex executable-self-display @kbd{M-x executable-self-display} adds a magic number to the buffer, which diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 38f46a3dd7b..3aa923cc346 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -21279,7 +21279,7 @@ name (or part of a name) to match. @node The swish++ Engine @subsubsection The swish++ Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish++ may be found at the swish++ sourceforge page: @uref{http://swishplusplus.sourceforge.net} @@ -21302,7 +21302,7 @@ to get a group name. By default this is @code{$HOME/Mail}. @node The swish-e Engine @subsubsection The swish-e Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish-e may be found at the swish-e homepage @uref{http://swish-e.org} diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 4d828f69bbd..d9062a32572 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -904,7 +904,7 @@ happen---Message will encode non-@acronym{ASCII} domain names in @code{From}, Until @acronym{IDNA} becomes more well known, Message queries you whether @acronym{IDNA} encoding of the domain name really should occur. Some users might not be aware that domain names can contain -non-@acronym{ASCII} now, so this gives them a safety net if they accidently +non-@acronym{ASCII} now, so this gives them a safety net if they accidentally typed a non-@acronym{ASCII} domain name. @vindex message-use-idna diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 34a4ba4f8f3..181e00f8e02 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -7219,7 +7219,7 @@ will be made in the agenda: #+CATEGORY: Holiday %%(org-calendar-holiday) ; special function for holiday names #+CATEGORY: Ann -%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is allways according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old +%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is always according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old %%(org-anniversary 1869 10 2) Mahatma Gandhi would be %d years old @end example @@ -7797,8 +7797,8 @@ Interactively select another agenda view and append it to the current view. @item o Delete other windows. @c -@orgcmdkskc{v d,d,org-aganda-day-view} -@xorgcmdkskc{v w,w,org-aganda-day-view} +@orgcmdkskc{v d,d,org-agenda-day-view} +@xorgcmdkskc{v w,w,org-agenda-day-view} @xorgcmd{v m,org-agenda-month-view} @xorgcmd{v y,org-agenda-month-year} @xorgcmd{v SPC,org-agenda-reset-view} diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 55b60937fb6..dcfff1fcb96 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -613,7 +613,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. @c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect @c LocalWords: nosnarf obarray OLE OO outputfile paren parsetable POINT's @c LocalWords: popup positionalonly positiononly positionormarker pre -@c LocalWords: printf printindex Programmatically pt punctuations quotemode +@c LocalWords: printf printindex Programmatically pt quotemode @c LocalWords: ref regex regexp Regexps reparse resetfile samp sb @c LocalWords: scopestart SEmantic semanticdb setfilename setq @c LocalWords: settitle setupfunction sexp sp SPC speedbar speedbar's diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index d9739b93925..8300e6511a6 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -446,7 +446,7 @@ list. execute when starting SES mode for a buffer). The variable @code{safe-functions} is a list of possibly-unsafe -functions to be treated as safe when analysing formulas and printers. +functions to be treated as safe when analyzing formulas and printers. @xref{Virus protection}. Before customizing @code{safe-functions}, think about how much you trust the person who's suggesting this change. The value @code{t} turns off all anti-virus protection. A diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e6b0f4fa235..f7f340074a2 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3573,7 +3573,7 @@ The verbosity levels are When @code{tramp-verbose} is greater than or equal to 4, the messages are also written into a @value{tramp} debug buffer. This debug buffer -is useful for analysing problems; sending a @value{tramp} bug report +is useful for analyzing problems; sending a @value{tramp} bug report should be done with @code{tramp-verbose} set to a verbosity level of at least 6 (@pxref{Bug Reports}). diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 4ab75dcfc45..f02b795a6b9 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1584,7 +1584,7 @@ message (closes SF #701756). MH-E now supports several spam filters including Bogofilter, SpamProbe, and SpamAssassin. Spam that is mistakenly considered to be good mail can be reclassified as spam with "J b (mh-junk-blacklist)". -Conversely, good mail that is accidently considered to be spam can be +Conversely, good mail that is accidentally considered to be spam can be reclassified with "J w (mh-junk-whitelist)" (closes SF #669518). If a message is blacklisted, and `mh-junk-mail-folder' is a string, diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el index 210aeea7e62..7e108a71a60 100644 --- a/leim/quail/ethiopic.el +++ b/leim/quail/ethiopic.el @@ -53,7 +53,7 @@ C-F9 or `M-x ethio-toggle-space' punctuation followed by zero or more ASCII spaces'. S-F5 or `M-x ethio-toggle-punctuation' - Toggles ASCII punctuations and Ethiopic punctuations for keyboard input. + Toggles ASCII punctuation and Ethiopic punctuation for keyboard input. The current mode is indicated by `.' (ASCII) or `$(3$i(B' (Ethiopic). S-SPC or `M-x ethio-insert-ethio-space' diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el index c5c7061663e..ba47155524f 100644 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@ -28,7 +28,7 @@ ;; Created: Feb. 17. 1997 ;; History: -;; 1997.03.13 Support for inputting special signs and punctuations added. +;; 1997.03.13 Support for inputting special signs and punctuation added. ;; (Only Ext. Wylie input) ;;; Commentary: @@ -56,7 +56,7 @@ (if (string-match "^-[dy]" quail-current-key) (setq quail-current-key (substring quail-current-key 1))) (let ((str (tibetan-transcription-to-tibetan quail-current-key))) - ;; If quail-current-key is for punctuations, it can't be + ;; If quail-current-key is for punctuation, it can't be ;; transcribed by tibetan-transcription-to-tibetan, thus STR ;; contains ASCII string now. In that case, use the current ;; characters set in quail-current-str. @@ -80,7 +80,7 @@ '(("-d" . "$(7"2(B") ("-y" . "$(7"B(B"))) -;; Punctuations are not transcribed. +;; Punctuation characters are not transcribed. (defconst tibetan-wylie-punctuation-alist '(("." . " ") diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index cb1d1af577b..bf6f21cd422 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -5904,7 +5904,7 @@ (mis-)use tramp-current-user as indication, assuming it is set in `tramp-completion-handle-file-name-all-completions'. (tramp-send-region): Handle the case `tramp-chunksize' is equal 0. - I did it accidently. Infinite loop ... + I did it accidentally. Infinite loop ... (tramp-get-device): `tramp-make-tramp-file-name' must not be called with NIL path. It fails in case of multi-method. (tramp-file-name-for-operation): Apply `expand-file-name' for diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 1660009aba7..7df2b4b7488 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -10695,7 +10695,7 @@ * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for the prompt. If it returns earlier (when detecting an error - message), the rest of the output will merge accidently with the + message), the rest of the output will merge accidentally with the output of the next command. Reported by M Jared Finder . @@ -16181,7 +16181,7 @@ 2005-12-08 Alan Mackenzie - * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the + * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the start of the file. ^L now separate sections of the file. (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re) (c-awk-one-line-possibly-open-string-re) diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 57a9a7b026a..cb39ca5997f 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -9536,7 +9536,7 @@ it@top level. * texnfo-upd.el (texinfo-incorporate-descriptions): Don't - accidently find a string in the description that is confused for + accidentally find a string in the description that is confused for a menu item. 1990-06-01 Robert J. Chassell (bob@wheat-chex) @@ -12454,4 +12454,3 @@ See ChangeLog.2 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 7aca1b521a2..77ea9fd9d5d 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -530,7 +530,7 @@ composition-function-table. (tibetan-composable-pattern): New variable. (tibetan-subjoined-transcription-alist): Change key "R" to "+R". - (tibetan-precomposition-rule-alist): Move punctuations to + (tibetan-precomposition-rule-alist): Move punctuation to tibetan-punctuation-transcription-alist and tibetan-obsolete-glyphs. (tibetan-punctuation-transcription-alist): New variable. diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 6179d304464..f17dfd85fdf 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded." "Return a project description object if DIR has a project. Optional argument FORCE means to ignore a hash-hit of 'nomatch. This depends on an up to date `ede-project-class-files' variable. -Any directory that contains the file .ede-ignore will allways +Any directory that contains the file .ede-ignore will always return nil." (when (not (file-exists-p (expand-file-name ".ede-ignore" dir))) (let* ((dirtest (expand-file-name dir)) diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index ec514194e33..4e233f56a12 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.") ; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^") ; ) ; :commands '("$(C_SHARED_LINK) %s") - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") @@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.") :variables '(("CXX_SHARED" . "g++") ("CXX_SHARED_COMPILE" . "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")) - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 1d1184e534f..98b1ab55c32 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments." ;; regexp match semicolons inside strings! semantic-lex-ignore-comments ;; Must detect prefixed list before punctuation because prefix chars - ;; are also punctuations! + ;; are also punctuation! semantic-grammar-wy---sexp-analyzer - ;; Must detect punctuations after comments because the semicolon can - ;; be a punctuation or a comment start! + ;; Must detect punctuation after comments because the semicolon can + ;; be punctuation or a comment start! semantic-grammar-wy---string-analyzer semantic-grammar-wy---block-analyzer semantic-grammar-wy---sexp-analyzer) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index fca367ecb8c..ba43ba657a1 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -165,7 +165,7 @@ ;; ;; %type syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string ;; -;; ;; Some punctuations based on the type defines above +;; ;; Some punctuation based on the type defines above ;; ;; %token NOT "!" ;; %token NOTEQ "!=" @@ -1313,7 +1313,7 @@ and number formats." (define-lex-analyzer semantic-lex-punctuation-type "Detect and create a punctuation type token. -Recognized punctuations are defined in the current table of lexical +Recognized punctuation is defined in the current table of lexical types, as the value of the `punctuation' token type." (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+") (let* ((key (match-string 0)) diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el index 5399d4d5649..b4618d1c18f 100644 --- a/lisp/cedet/semantic/senator.el +++ b/lisp/cedet/semantic/senator.el @@ -179,8 +179,8 @@ source." (goto-char (semantic-tag-start tag)) (when (re-search-forward (concat ;; The tag name is expected to be - ;; between word delimiters, whitespaces, - ;; or punctuations. + ;; between word delimiters, whitespace, + ;; or punctuation. "\\(\\<\\|\\s-+\\|\\s.\\)" (regexp-quote name) "\\(\\>\\|\\s-+\\|\\s.\\)") diff --git a/lisp/color.el b/lisp/color.el index 487e280dd59..96b79a4ace2 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -128,8 +128,8 @@ inclusive." RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, inclusive. -Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians -and both SATURATION and LUMINENCE are between 0.0 and 1.0, +Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians +and both SATURATION and LUMINANCE are between 0.0 and 1.0, inclusive." (let* ((r red) (g green) diff --git a/lisp/follow.el b/lisp/follow.el index 72a091e8ce2..3badb381c57 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -98,7 +98,7 @@ ;; (global-set-key [f7] 'follow-delete-other-windows-and-split) -;; There exist two system variables that control the appearence of +;; There exist two system variables that control the appearance of ;; lines wider than the window containing them. The default is to ;; truncate long lines whenever a window isn't as wide as the frame. ;; diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index eed5f921c57..de5f5e0b7c4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -2778,7 +2778,7 @@ 2011-01-28 Lars Ingebrigtsen * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active - data if the group is unactivated. + data if the group is deactivated. 2011-01-28 Julien Danjou diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index f913ddb5378..3ee72bc5fc6 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility." 'static-color 'pseudo-color))))) 'gnome 'retro) - "Prefered tool bar style." + "Preferred tool bar style." :type '(choice (const :tag "GNOME style" gnome) (const :tag "Retro look" retro)) :group 'gmm) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 9d358969062..02c37f22774 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP." (predicate t) ; We list all groups? (t (or - (if (eq unread t) ; Unactivated? + (if (eq unread t) ; Deactivated? gnus-group-list-inactive-groups - ; We list unactivated + ; We list inactive (and (numberp unread) (> unread 0))) ; We list groups with unread articles (and gnus-list-groups-with-ticked-articles diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 17af1a38333..87ca27adcf4 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -582,7 +582,7 @@ articles in the topic and its subtopics." (or gnus-topic-display-empty-topics ;We want empty topics (not (zerop unread)) ;Non-empty tick ;Ticked articles - (/= point-max (point-max)))) ;Unactivated groups + (/= point-max (point-max)))) ;Inactive groups (gnus-extent-start-open (point)) (gnus-topic-insert-topic-line (car type) visiblep diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 36c56e0921b..44e2af5b904 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -360,7 +360,7 @@ to: (\"text/html\" \"text/richtext\") Adding \"image/.*\" might also be useful. Spammers use it as the -prefered part of multipart/alternative messages. See also +preferred part of multipart/alternative messages. See also `gnus-buttonized-mime-types', to which adding \"multipart/alternative\" enables you to choose manually one of two types those mails include." :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'. diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index feed078034c..f1cb1f69e56 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -586,7 +586,7 @@ should not change this value.") ((>= column rfc2047-encode-max-chars) (when eword (cond ((string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) ((string-match "(+\\'" eword) ;; Break the line before the open parenthesis. @@ -639,7 +639,7 @@ should not change this value.") (setq crest " " eword (concat eword next))) (when (string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) (rfc2047-encode-1 (length crest) (substring string index) cs encoder start " " tail diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 58dbebf4c5a..af9fd42c127 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -35,7 +35,7 @@ ;; and the second one is Simon Josefsson's starttls.el which uses ;; "gnutls-cli" from GnuTLS. ;; -;; If "starttls" is available, it is prefered by the code over +;; If "starttls" is available, it is preferred by the code over ;; "gnutls-cli", for backwards compatibility. Use ;; `starttls-use-gnutls' to toggle between implementations if you have ;; both tools installed. It is recommended to use GnuTLS, though, as diff --git a/lisp/help.el b/lisp/help.el index 506889c210e..36d49aae9b3 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -969,7 +969,7 @@ This is effective only when Temp Buffer Resize mode is enabled. The value is the maximum height (in lines) which `resize-temp-buffer-window' will give to a window displaying a temporary buffer. It can also be a function to be called to -choose the height for such a buffer. It gets one argumemt, the +choose the height for such a buffer. It gets one argument, the buffer, and should return a positive integer. At the time the function is called, the window to be resized is selected." :type '(choice integer function) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 58a08f4506f..d078d98a480 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -703,13 +703,13 @@ If the value is nil, on decoding, don't treat the first two-byte as BOM, and on encoding, don't produce BOM bytes. If the value is t, on decoding, skip the first two-byte as BOM, and on -encoding, produce BOM bytes accoding to the value of `:endian'. +encoding, produce BOM bytes according to the value of `:endian'. If the value is cons, on decoding, check the first two-byte. If they are 0xFE 0xFF, use the car part coding system of the value. If they are 0xFF 0xFE, use the cdr part coding system of the value. Otherwise, treat them as bytes for a normal character. On encoding, -produce BOM bytes accoding to the value of `:endian'. +produce BOM bytes according to the value of `:endian'. This attribute has a meaning only when `:coding-type' is `utf-16' or `utf-8'. diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 0ba0b9085b9..6614ac8b416 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -128,11 +128,11 @@ SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N \\") ("chinese-punct-b5" "$(0O:(BB" - "Input method for Chinese punctuations and symbols of Big5 + "Input method for Chinese punctuation and symbols of Big5 \(`chinese-big5-1' and `chinese-big5-2').") ("chinese-punct" "$A1j(BG" - "Input method for Chinese punctuations and symbols of GB2312 + "Input method for Chinese punctuation and symbols of GB2312 \(`chinese-gb2312').") ("chinese-py-b5" "$(03<(BB" @@ -801,36 +801,36 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y)))))) (dolist (elt dic) (insert (format "(%S\t%S)\n" (car elt) (cdr elt)))) - (let ((punctuations '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") - (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") - ("'" "$(0!e!d(B" "$(G!e!d(B") - ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") - ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") - ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") - ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") - ("?" "$(0!)!4(B" "$(G!)!4(B") - ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") - (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") - ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") - ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") - ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") - ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") - ("`" "$(0!j!k(B" "$(G!j!k(B") - ("~" "$(0"D"+",!!^!@(B" "$(G!>!^!@(B") - (")" "$(0!?!_!A(B" "$(G!?!_!A(B") - ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") - ("_" "$(0"%"&(B" "$(G"%"&(B") - ("=" "$(0"8"C(B" "$(G"8"C(B") - ("+" "$(0"0"?(B" "$(G"0"?(B")))) - (dolist (elt punctuations) + (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") + (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") + ("'" "$(0!e!d(B" "$(G!e!d(B") + ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") + ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") + ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") + ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") + ("?" "$(0!)!4(B" "$(G!)!4(B") + ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") + (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") + ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") + ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") + ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") + ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") + ("`" "$(0!j!k(B" "$(G!j!k(B") + ("~" "$(0"D"+",!!^!@(B" "$(G!>!^!@(B") + (")" "$(0!?!_!A(B" "$(G!?!_!A(B") + ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") + ("_" "$(0"%"&(B" "$(G"%"&(B") + ("=" "$(0"8"C(B" "$(G"8"C(B") + ("+" "$(0"0"?(B" "$(G"0"?(B")))) + (dolist (elt punctuation) (insert (format "(%S %S)\n" (concat "z" (car elt)) (if big5-p (nth 1 elt) (nth 2 elt)))))) (insert ")\n"))) @@ -1017,7 +1017,7 @@ To input words of more than three letters, you type 4 keys, initials of the first three letters and the last letter. For instance, \"bjdt\" inputs $A11>)5gJSL((B. -To input symbols and punctuations, type `/' followed by one of `a' to +To input symbols and punctuation, type `/' followed by one of `a' to `z', then select one of the candidates.")) (insert " '((\"\C-?\" . quail-delete-last-char) (\".\" . quail-next-translation) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 444f4d519da..1d93d981f8e 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -802,7 +802,7 @@ The 2nd and 3rd arguments BEGIN and END specify the region." (forward-char 1) (insert "}"))) - ;; Special Ethiopic punctuations. + ;; Special Ethiopic punctuation. (goto-char (point-min)) (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t) (cond diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 8458974e753..fd23bbb6d54 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -27,7 +27,7 @@ ;;; History: ;; 1997.03.13 Modification in treatment of text properties; -;; Support for some special signs and punctuations. +;; Support for some special signs and punctuation. ;; 1999.10.25 Modification for a new composition way by K.Handa. ;;; Commentary: diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index c80b22c696d..1607868dea5 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -30,7 +30,7 @@ ;;; History: -;; 1997.03.13 Modification for special signs and punctuations. +;; 1997.03.13 Modification for special signs and punctuation. ;;; Commentary: @@ -44,7 +44,7 @@ ;;; ;;; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5) -;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations, +;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuation, ;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and ;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs. ;;;2160 $(7!`(B $(7!a(B $(7!b(B $(7!c(B $(7!d(B $(7!e(B $(7!f(B $(7!g(B $(7!h(B $(7!i(B $(7!j(B $(7!k(B $(7!l(B $(7!m(B $(7!n(B $(7!o(B ; diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index f1d25158ce2..b0d08217fc1 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -818,7 +818,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of `allout-distinctive-bullets-string'. When creating a TOPIC, plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you - provide a universal argugment (\\[universal-argument]) to the + provide a universal argument (\\[universal-argument]) to the TOPIC creation command, or when explictly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 6bdd96c0fcc..02e531120be 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -2674,7 +2674,7 @@ Follow MH-E Developers Guide conventions. Use `' quotes for Help hyperlinks such as symbols, Info nodes, or URLs. Use \" quotes for - everything else. Otherwise, you can accidently get links to + everything else. Otherwise, you can accidentally get links to nonsense symbols. 2005-12-22 Bill Wohler @@ -3456,4 +3456,3 @@ ;; sentence-end-double-space: nil ;; add-log-time-zone-rule: t ;; End: - diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 87ff0b4060f..af8bc084b57 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -128,7 +128,7 @@ LOCATION is used as the address location for bbdb." zip city state) (setq addr-components (nreverse addr-components)) ;; If not containing the zip code the last line is supposed to contain a - ;; country name and the addres is supposed to be in european style + ;; country name and the address is supposed to be in european style (if (not (string-match "[0-9][0-9][0-9]" last1)) (progn (setq state last1) diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 7e0eaff1dce..1a48e8863f1 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -729,7 +729,7 @@ to their attributes." ;; Create the search buffer. (with-current-buffer (get-buffer-create "*Secrets*") (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `secrets-mode'. + ;; Initialize buffer with `secrets-mode'. (secrets-mode) (secrets-show-collections)))) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index fda88351253..df841bade79 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -996,7 +996,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." (let ((signal-name (dbus-event-member-name last-input-event)) (elt mount-info)) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) @@ -1066,7 +1066,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." tramp-gvfs-interface-mounttracker "listMounts")) nil) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 907c99a7e86..ab817a43885 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -820,7 +820,7 @@ search, is returned." (with-current-buffer (generate-new-buffer (xesam-buffer-name service search)) (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `xesam-mode'. `xesam-vendor' must be + ;; Initialize buffer with `xesam-mode'. `xesam-vendor' must be ;; set before calling `xesam-mode', because we want to give the ;; hook functions a chance to identify their search engine. (setq xesam-vendor (xesam-get-cached-property engine "vendor.id")) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 94346a4944a..1c8a3e72956 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -17596,7 +17596,7 @@ 2008-06-17 Carsten Dominik * org.el (org-schedule, org-deadline): Protect scheduled and - deadline tasks against changes that accidently remove the + deadline tasks against changes that accidentally remove the repeater. Also show a message with the new date when done. 2008-06-17 Carsten Dominik diff --git a/lisp/printing.el b/lisp/printing.el index d6c67cc68a6..2dea24149a7 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -547,7 +547,7 @@ Please send all bug fixes and enhancements to ;; `pr-auto-region' Non-nil means region is automagically detected. ;; ;; `pr-auto-mode' Non-nil means major-mode specific printing is -;; prefered over normal printing. +;; preferred over normal printing. ;; ;; `pr-mode-alist' Specify an alist for a major-mode and printing ;; function. @@ -2426,7 +2426,7 @@ marked instead of all buffer." (defcustom pr-auto-mode t - "Non-nil means major-mode specific printing is prefered over normal printing. + "Non-nil means major-mode specific printing is preferred over normal printing. That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' and `*-region*' commands will behave like `*-mode*' commands; otherwise, @@ -5458,7 +5458,7 @@ If menu binding was not done, calls `pr-menu-bind'." (defun pr-toggle-mode-menu (&optional no-menu) - "Toggle whether major-mode specific printing is prefered over normal printing." + "Toggle whether major-mode specific printing is preferred over normal printing." (interactive) (pr-toggle 'pr-auto-mode "Auto mode" 'printing 1 12 'toggle nil no-menu)) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 9352725384b..07359539256 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -7650,7 +7650,7 @@ $~ The name of the current report format. ... &= ... Bitwise and assignment. ... * ... Multiplication. ... ** ... Exponentiation. -*NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. +*NAME Glob: all objects referred by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. &NAME(arg0, ...) Subroutine call. Arguments go to @_. ... + ... Addition. +EXPR Makes EXPR into scalar context. ++ Auto-increment (magical on strings). ++EXPR EXPR++ diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 30df073df12..b1c6e367ef7 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3811,7 +3811,7 @@ Ediff Control Panel to restore highlighting." ;; later, and nconc above will break it. Either this or use slow ;; append instead of nconc (selected-buffers (ediff-get-selected-buffers)) - (prefered-buffer (car all-buffers)) + (preferred-buffer (car all-buffers)) visible-dired-buffers (excl-buff-name-list (mapcar @@ -3841,7 +3841,7 @@ Ediff Control Panel to restore highlighting." (cond ((member (buffer-name x) excl-buff-name-list) nil) ((memq x selected-buffers) x) ((not (ediff-get-visible-buffer-window x)) nil) - ((eq x prefered-buffer) x) + ((eq x preferred-buffer) x) ;; if prev selected buffer is dired, look only at ;; dired. ((eq use-dired-major-mode 'yes) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 20361d32450..1f54b8577c3 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -384,7 +384,7 @@ bit output with no translation." ;; ;; If Unicode Windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) -;; Prefered names +;; Preferred names (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index ada5e0f78ef..6acc09c2164 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -1003,7 +1003,7 @@ (syms_of_xdisp): DEFVAR_LISP and initialize it. Update doc string to describe new value `grow-only', and use of C-l. (display_tool_bar_line): Only use default face for border below - toolbar if not grow-only (to get acceptable visual appearence). + toolbar if not grow-only (to get acceptable visual appearance). Explicitly set visible_height for empty toolbar lines. (redisplay_tool_bar): Handle `grow-only' setting. Check and clear minimize_tool_bar_window_p flag. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index e21af17657f..6bc83055c7b 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -8018,7 +8018,7 @@ * xterm.c (x_scroll_run): Renamed from do_line_dance. - * xdisp.c (redisplay_window): For window-based redisplay, alway + * xdisp.c (redisplay_window): For window-based redisplay, always try try_window_id. * xterm.c (struct glyph_string): New member two_byte_p that is diff --git a/src/callint.c b/src/callint.c index 61ab4a3963e..80e24f6c8ee 100644 --- a/src/callint.c +++ b/src/callint.c @@ -78,7 +78,7 @@ c -- Character (no input method is used). C -- Command name: symbol with interactive function definition. d -- Value of point as number. Does not do I/O. D -- Directory name. -e -- Parametrized event (i.e., one that's a list) that invoked this command. +e -- Parameterized event (i.e., one that's a list) that invoked this command. If used more than once, the Nth `e' returns the Nth parameterized event. This skips events that are integers or symbols. f -- Existing file name. diff --git a/src/ccl.c b/src/ccl.c index 84d7a6a25ff..b7228a4d1cd 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -561,7 +561,7 @@ static Lisp_Object Vccl_program_table; If VALn is lambda, move to the next map set like reaching to the end of the current map set. - If VALn is a symbol, call the CCL program refered by it. + If VALn is a symbol, call the CCL program referred by it. Then, use reg[rrr] as a mapped value except for -1, -2 and -3. Such special values are regarded as nil, t, and lambda respectively. diff --git a/src/cm.h b/src/cm.h index 8f23990ce55..dbf0820b94c 100644 --- a/src/cm.h +++ b/src/cm.h @@ -66,7 +66,7 @@ struct cm location */ unsigned int cm_autolf:1; /* \r performs a \r\n (rn) */ - /* Parametrized capabilities. This needs to be a struct since + /* Parameterized capabilities. This needs to be a struct since the costs are accessed through pointers. */ #if 0 diff --git a/src/fringe.c b/src/fringe.c index 61fd2f2b998..da896e07b76 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -35,7 +35,7 @@ along with GNU Emacs. If not, see . */ Logical bitmaps are used internally to denote things like 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc. - Physical bitmaps specify the visual appearence of the bitmap, + Physical bitmaps specify the visual appearance of the bitmap, e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc. User defined bitmaps are physical bitmaps. diff --git a/src/process.c b/src/process.c index a02ba44ae71..892bd9820bf 100644 --- a/src/process.c +++ b/src/process.c @@ -3717,7 +3717,7 @@ DEFUN ("network-interface-info", Fnetwork_interface_info, Snetwork_interface_inf doc: /* Return information about network interface named IFNAME. The return value is a list (ADDR BCAST NETMASK HWADDR FLAGS), where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address, -NETMASK is the layer 3 network mask, HWADDR is the layer 2 addres, and +NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and FLAGS is the current flags of the interface. */) (Lisp_Object ifname) { -- cgit v1.2.3 From 78adbf9c3f71e4387d4b01697b76999c883735c4 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 26 Nov 2011 14:28:10 +0800 Subject: Add grammar files for grammar-wy.el and wrt-wy.el. Regenerate the relevant CEDET parsers. * admin/grammars/bovine-grammar.el: * admin/grammars/wisent-grammar.el: Add scripts for generating the parsers. --- admin/grammars/README | 13 +- admin/grammars/bovine-grammar.el | 62 ++++ admin/grammars/grammar.wy | 434 +++++++++++++++++++++++++++ admin/grammars/srecode-template.wy | 235 +++++++++++++++ admin/grammars/wisent-grammar.el | 176 +++++++++++ lisp/cedet/ChangeLog | 8 + lisp/cedet/semantic/bovine/c-by.el | 2 +- lisp/cedet/semantic/grammar-wy.el | 505 ++++++++++++++++---------------- lisp/cedet/semantic/wisent/javat-wy.el | 49 ++-- lisp/cedet/semantic/wisent/js-wy.el | 106 ++++--- lisp/cedet/semantic/wisent/python-wy.el | 87 ++++-- lisp/cedet/srecode/srt-wy.el | 33 +-- 12 files changed, 1350 insertions(+), 360 deletions(-) create mode 100644 admin/grammars/grammar.wy create mode 100644 admin/grammars/srecode-template.wy (limited to 'lisp/cedet/semantic') diff --git a/admin/grammars/README b/admin/grammars/README index c8328bbc885..419797e0dcb 100644 --- a/admin/grammars/README +++ b/admin/grammars/README @@ -3,17 +3,8 @@ generate the parser data in the lisp/semantic/bovine/ and lisp/semantic/wisent/ directories. You can run the parser generators with -emacs -batch --no-site-file -l bovine-grammar.el -f semantic-mode \ - -f semantic-grammar-batch-build-packages *.by - -emacs -batch --no-site-file -l wisent-grammar.el -f semantic-mode \ - -f semantic-grammar-batch-build-packages *.wy - -The output files were subsequently edited by hand to fix copyright -headers, variable names (to follow library name conventions), and -feature names. These changes do not alter the code logic, and can be -viewed by diffing to the files in lisp/semantic/bovine/ and -lisp/semantic/wisent/. +emacs -batch -Q -l bovine-grammar.el -f bovine-make-parsers +emacs -batch -Q -l wisent-grammar.el -f wisent-make-parsers Currently, the parser files in lisp/ are not generated directly from these grammar files when making Emacs. This state of affairs, and the diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el index 0e8756e1c5b..3ff15fab66f 100644 --- a/admin/grammars/bovine-grammar.el +++ b/admin/grammars/bovine-grammar.el @@ -454,4 +454,66 @@ Menu items are appended to the common grammar menu.") (provide 'semantic/bovine/grammar) +(defun bovine-make-parsers () + "Generate Emacs' built-in Bovine-based parser files." + (semantic-mode 1) + ;; Loop through each .by file in current directory, and run + ;; `semantic-grammar-batch-build-one-package' to build the grammar. + (dolist (f (directory-files default-directory nil ".by$")) + (let ((packagename + (condition-case err + (with-current-buffer (find-file-noselect f) + (semantic-grammar-create-package)) + (error (message "%s" (error-message-string err)) nil))) + lang) + (when (and packagename + (string-match "^semantic-\\(.*\\)-by.el$" packagename)) + (setq lang (match-string 1 packagename)) + (with-temp-buffer + (insert-file-contents packagename) + (setq buffer-file-name (expand-file-name packagename)) + ;; Fix copyright header: + (goto-char (point-min)) + (re-search-forward "^;; Author:") + (setq copyright-end (match-beginning 0)) + (re-search-forward "^;;; Code:\n") + (delete-region copyright-end (match-end 0)) + (goto-char copyright-end) + (insert ";; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: +;; +;; This file was generated from admin/grammars/" + lang ".by. + +;;; Code: + +\(require 'semantic/lex) +\(eval-when-compile (require 'semantic/bovine))\n") + (goto-char (point-min)) + (delete-region (point-min) (line-end-position)) + (insert ";;; semantic/bovine/" lang + "-by.el --- Generated parser support file") + (delete-trailing-whitespace) + ;; Fix footer: + (goto-char (point-max)) + (re-search-backward ".\n;;; Analyzers") + (delete-region (point) (point-max)) + (insert "(provide 'semantic/bovine/" lang "-by)\n\n") + (insert ";;; semantic/bovine/" lang "-by.el ends here\n") + (save-buffer)))))) + ;;; bovine-grammar.el ends here diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy new file mode 100644 index 00000000000..18e8b814303 --- /dev/null +++ b/admin/grammars/grammar.wy @@ -0,0 +1,434 @@ +;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars +;; +;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; +;; Author: David Ponce +;; Maintainer: David Ponce +;; Created: 26 Aug 2002 +;; Keywords: syntax +;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $ + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +%{ +(defvar semantic-grammar-lex-c-char-re) + +;; Current parsed nonterminal name. +(defvar semantic-grammar-wy--nterm nil) +;; Index of rule in a nonterminal clause. +(defvar semantic-grammar-wy--rindx nil) +} + +%package semantic-grammar-wy + +%languagemode wy-mode + +;; Main +%start grammar +;; Reparse +%start prologue epilogue declaration nonterminal rule +;; EXPANDFULL +%start put_names put_values use_names + +;; Keywords +%type +%keyword DEFAULT-PREC "%default-prec" +%keyword NO-DEFAULT-PREC "%no-default-prec" +%keyword KEYWORD "%keyword" +%keyword LANGUAGEMODE "%languagemode" +%keyword LEFT "%left" +%keyword NONASSOC "%nonassoc" +%keyword PACKAGE "%package" +%keyword PREC "%prec" +%keyword PUT "%put" +%keyword QUOTEMODE "%quotemode" +%keyword RIGHT "%right" +%keyword SCOPESTART "%scopestart" +%keyword START "%start" +%keyword TOKEN "%token" +%keyword TYPE "%type" +%keyword USE-MACROS "%use-macros" + +;; Literals +%type +%token STRING + +%type syntax ":?\\(\\sw\\|\\s_\\)+" +%token SYMBOL +%token PERCENT_PERCENT "\\`%%\\'" + +%type syntax semantic-grammar-lex-c-char-re +%token CHARACTER + +%type matchdatatype sexp syntax "\\s'\\s-*(" +%token PREFIXED_LIST + +%type matchdatatype sexp syntax "\\=" +%token SEXP + +;; Don't generate these analyzers which needs special handling code. +%token PROLOGUE "%{...%}" +%token EPILOGUE "%%...EOF" + +;; Blocks & Parenthesis +%type +%token PAREN_BLOCK "(LPAREN RPAREN)" +%token BRACE_BLOCK "(LBRACE RBRACE)" +%token LPAREN "(" +%token RPAREN ")" +%token LBRACE "{" +%token RBRACE "}" + +;; Punctuations +%type +%token COLON ":" +%token SEMI ";" +%token OR "|" +%token LT "<" +%token GT ">" + +%% + +grammar: + prologue + | epilogue + | declaration + | nonterminal + | PERCENT_PERCENT + ; + +;;; Prologue/Epilogue +;; +prologue: + PROLOGUE + (CODE-TAG "prologue" nil) + ; + +epilogue: + EPILOGUE + (CODE-TAG "epilogue" nil) + ; + +;;; Declarations +;; +declaration: + decl + (eval $1) + ; + +decl: + default_prec_decl + | no_default_prec_decl + | languagemode_decl + | package_decl + | precedence_decl + | put_decl + | quotemode_decl + | scopestart_decl + | start_decl + | keyword_decl + | token_decl + | type_decl + | use_macros_decl + ; + +default_prec_decl: + DEFAULT-PREC + `(TAG "default-prec" 'assoc :value '("t")) + ; + +no_default_prec_decl: + NO-DEFAULT-PREC + `(TAG "default-prec" 'assoc :value '("nil")) + ; + +languagemode_decl: + LANGUAGEMODE symbols + `(TAG ',(car $2) 'languagemode :rest ',(cdr $2)) + ; + +package_decl: + PACKAGE SYMBOL + `(PACKAGE-TAG ',$2 nil) + ; + +precedence_decl: + associativity token_type_opt items + `(TAG ',$1 'assoc :type ',$2 :value ',$3) + ; + +associativity: + LEFT + (progn "left") + | RIGHT + (progn "right") + | NONASSOC + (progn "nonassoc") + ; + +put_decl: + PUT put_name put_value + `(TAG ',$2 'put :value ',(list $3)) + | PUT put_name put_value_list + `(TAG ',$2 'put :value ',$3) + | PUT put_name_list put_value + `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',(list $3)) + | PUT put_name_list put_value_list + `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',$3) + ; + +put_name_list: + BRACE_BLOCK + (mapcar 'semantic-tag-name (EXPANDFULL $1 put_names)) + ; + +put_names: + LBRACE + () + | RBRACE + () + | put_name + ;; Must return a list of Semantic tags to EXPANDFULL! + (TAG $1 'put-name) + ; + +put_name: + SYMBOL + | token_type + ; + +put_value_list: + BRACE_BLOCK + (mapcar 'semantic-tag-code-detail (EXPANDFULL $1 put_values)) + ; + +put_values: + LBRACE + () + | RBRACE + () + | put_value + ;; Must return a list of Semantic tags to EXPANDFULL! + (CODE-TAG "put-value" $1) + ; + +put_value: + SYMBOL any_value + (cons $1 $2) + ; + +scopestart_decl: + SCOPESTART SYMBOL + `(TAG ',$2 'scopestart) + ; + +quotemode_decl: + QUOTEMODE SYMBOL + `(TAG ',$2 'quotemode) + ; + +start_decl: + START symbols + `(TAG ',(car $2) 'start :rest ',(cdr $2)) + ; + +keyword_decl: + KEYWORD SYMBOL string_value + `(TAG ',$2 'keyword :value ',$3) + ; + +token_decl: + TOKEN token_type_opt SYMBOL string_value + `(TAG ',$3 ',(if $2 'token 'keyword) :type ',$2 :value ',$4) + | TOKEN token_type_opt symbols + `(TAG ',(car $3) 'token :type ',$2 :rest ',(cdr $3)) + ; + +token_type_opt: + ;; EMPTY + | token_type + ; + +token_type: + LT SYMBOL GT + (progn $2) + ; + +type_decl: + TYPE token_type plist_opt + `(TAG ',$2 'type :value ',$3) + ; + +plist_opt: + ;;EMPTY + | plist + ; + +plist: + plist put_value + (append (list $2) $1) + | put_value + (list $1) + ; + +use_name_list: + BRACE_BLOCK + (mapcar 'semantic-tag-name (EXPANDFULL $1 use_names)) + ; + +use_names: + LBRACE + () + | RBRACE + () + | SYMBOL + ;; Must return a list of Semantic tags to EXPANDFULL! + (TAG $1 'use-name) + ; + +use_macros_decl: + USE-MACROS SYMBOL use_name_list + `(TAG "macro" 'macro :type ',$2 :value ',$3) + ; + +string_value: + STRING + (read $1) + ; + +;; Return a Lisp readable form +any_value: + SYMBOL + | STRING + | PAREN_BLOCK + | PREFIXED_LIST + | SEXP + ; + +symbols: + lifo_symbols + (nreverse $1) + ; + +lifo_symbols: + lifo_symbols SYMBOL + (cons $2 $1) + | SYMBOL + (list $1) + ; + +;;; Grammar rules +;; +nonterminal: + SYMBOL + (setq semantic-grammar-wy--nterm $1 + semantic-grammar-wy--rindx 0) + COLON rules SEMI + (TAG $1 'nonterminal :children $4) + ; + +rules: + lifo_rules + (apply 'nconc (nreverse $1)) + ; + +lifo_rules: + lifo_rules OR rule + (cons $3 $1) + | rule + (list $1) + ; + +rule: + rhs + (let* ((nterm semantic-grammar-wy--nterm) + (rindx semantic-grammar-wy--rindx) + (rhs $1) + comps prec action elt) + (setq semantic-grammar-wy--rindx (1+ semantic-grammar-wy--rindx)) + (while rhs + (setq elt (car rhs) + rhs (cdr rhs)) + (cond + ;; precedence level + ((vectorp elt) + (if prec + (error "Duplicate %%prec in `%s:%d' rule" nterm rindx)) + (setq prec (aref elt 0))) + ;; action + ((consp elt) + ;; don't forget that rhs items are in reverse order, so + ;; the end-of-rule semantic action is the first item. + (if (or action comps) + ;; a mid-rule action + (setq comps (cons elt comps) + ;; keep rule and action index synchronized + semantic-grammar-wy--rindx + (1+ semantic-grammar-wy--rindx)) + ;; the end-of-rule action + (setq action (car elt)))) + ;; item + (t + (setq comps (cons elt comps))))) + (EXPANDTAG + (TAG (format "%s:%d" nterm rindx) 'rule + :type (if comps "group" "empty") + :value comps :prec prec :expr action))) + ; + +rhs: + ;; EMPTY + | rhs item + (cons $2 $1) + | rhs action + (cons (list $2) $1) + | rhs PREC item + (cons (vector $3) $1) + ; + +action: + PAREN_BLOCK + | PREFIXED_LIST + | BRACE_BLOCK + (format "(progn\n%s)" + (let ((s $1)) + (if (string-match "^{[\r\n\t ]*" s) + (setq s (substring s (match-end 0)))) + (if (string-match "[\r\n\t ]*}$" s) + (setq s (substring s 0 (match-beginning 0)))) + s)) + ; + +items: + lifo_items + (nreverse $1) + ; + +lifo_items: + lifo_items item + (cons $2 $1) + | item + (list $1) + ; + +item: + SYMBOL + | CHARACTER + ; + +%% + +;;; grammar.wy ends here diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy new file mode 100644 index 00000000000..4ff2d7e4e41 --- /dev/null +++ b/admin/grammars/srecode-template.wy @@ -0,0 +1,235 @@ +;;; srecode-template.wy --- Semantic Recoder Template parser + +;; Copyright (C) 2005-2011 Free Software Foundation, Inc. + +;; Author: Eric Ludlam +;; Keywords: syntax +;; X-RCS: $Id: srecode-template.wy,v 1.10 2009-01-09 23:01:54 zappo Exp $ + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: +;; +;; Parser for the Semantic Recoder template language +;; +;; Semantic Recoder templates are based on Google Templates +;; and are at the bottom of the Semantic Recoder API. + +%languagemode srecode-mode + +%start template_file + +;;; KEYWORDS +%type +%keyword SET "set" +%put SET summary "set " +%keyword SHOW "show" +%put SHOW summary "show ; to show a section" +%keyword MACRO "macro" +%put MACRO summary "... macro \"string\" ..." +%keyword CONTEXT "context" +%put CONTEXT summary "context " +%keyword TEMPLATE "template" +%put TEMPLATE summary "template \\n