From 86361e1edcf4ae6a602a32ee32dba16a3470f407 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Feb 2011 21:07:32 -0800 Subject: cl-seq.el doc fixes. * lisp/emacs-lisp/cl-seq.el (union, nunion, intersection) (nintersection, set-difference, nset-difference) (set-exclusive-or, nset-exclusive-or): Doc fix. --- lisp/emacs-lisp/cl-seq.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index cb1730eff73..250110528d9 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -772,7 +772,7 @@ Return the sublist of LIST whose car matches. ;;;###autoload (defun union (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-union operation. -The result list contains all items that appear in either LIST1 or LIST2. +The resulting list contains all items that appear in either LIST1 or LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. \nKeywords supported: :test :test-not :key @@ -793,7 +793,7 @@ to avoid corrupting the original LIST1 and LIST2. ;;;###autoload (defun nunion (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-union operation. -The result list contains all items that appear in either LIST1 or LIST2. +The resulting list contains all items that appear in either LIST1 or LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. \nKeywords supported: :test :test-not :key @@ -804,7 +804,7 @@ whenever possible. ;;;###autoload (defun intersection (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-intersection operation. -The result list contains all items that appear in both LIST1 and LIST2. +The resulting list contains all items that appear in both LIST1 and LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. \nKeywords supported: :test :test-not :key @@ -827,7 +827,7 @@ to avoid corrupting the original LIST1 and LIST2. ;;;###autoload (defun nintersection (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-intersection operation. -The result list contains all items that appear in both LIST1 and LIST2. +The resulting list contains all items that appear in both LIST1 and LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. \nKeywords supported: :test :test-not :key @@ -837,7 +837,7 @@ whenever possible. ;;;###autoload (defun set-difference (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-difference operation. -The result list contains all items that appear in LIST1 but not LIST2. +The resulting list contains all items that appear in LIST1 but not LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. \nKeywords supported: :test :test-not :key @@ -857,7 +857,7 @@ to avoid corrupting the original LIST1 and LIST2. ;;;###autoload (defun nset-difference (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-difference operation. -The result list contains all items that appear in LIST1 but not LIST2. +The resulting list contains all items that appear in LIST1 but not LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. \nKeywords supported: :test :test-not :key @@ -868,7 +868,7 @@ whenever possible. ;;;###autoload (defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-exclusive-or operation. -The result list contains all items that appear in exactly one of LIST1, LIST2. +The resulting list contains all items appearing in exactly one of LIST1, LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. \nKeywords supported: :test :test-not :key @@ -881,7 +881,7 @@ to avoid corrupting the original LIST1 and LIST2. ;;;###autoload (defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys) "Combine LIST1 and LIST2 using a set-exclusive-or operation. -The result list contains all items that appear in exactly one of LIST1, LIST2. +The resulting list contains all items appearing in exactly one of LIST1, LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. \nKeywords supported: :test :test-not :key -- cgit v1.2.3 From 16b737dc09bfb9cce1f3b0f8e51ace7d6f4e651a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 10 Feb 2011 12:07:15 +0100 Subject: Update cl-loaddefs.el and ibuffer.el --- lisp/emacs-lisp/cl-loaddefs.el | 18 +++++++++--------- lisp/ibuffer.el | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index e6ede1ed6d4..badfdcc70b6 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -759,7 +759,7 @@ surrounded by (block NAME ...). ;;;;;; find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not ;;;;;; substitute-if substitute delete-duplicates remove-duplicates ;;;;;; delete-if-not delete-if delete* remove-if-not remove-if remove* -;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "ac5c427e92a38c5a2149acaa013caad9") +;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "50667ae0688aa15dad8a585096e7144f") ;;; Generated autoloads from cl-seq.el (autoload 'reduce "cl-seq" "\ @@ -1085,7 +1085,7 @@ Keywords supported: :key (autoload 'union "cl-seq" "\ Combine LIST1 and LIST2 using a set-union operation. -The result list contains all items that appear in either LIST1 or LIST2. +The resulting list contains all items that appear in either LIST1 or LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. @@ -1095,7 +1095,7 @@ Keywords supported: :test :test-not :key (autoload 'nunion "cl-seq" "\ Combine LIST1 and LIST2 using a set-union operation. -The result list contains all items that appear in either LIST1 or LIST2. +The resulting list contains all items that appear in either LIST1 or LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. @@ -1105,7 +1105,7 @@ Keywords supported: :test :test-not :key (autoload 'intersection "cl-seq" "\ Combine LIST1 and LIST2 using a set-intersection operation. -The result list contains all items that appear in both LIST1 and LIST2. +The resulting list contains all items that appear in both LIST1 and LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. @@ -1115,7 +1115,7 @@ Keywords supported: :test :test-not :key (autoload 'nintersection "cl-seq" "\ Combine LIST1 and LIST2 using a set-intersection operation. -The result list contains all items that appear in both LIST1 and LIST2. +The resulting list contains all items that appear in both LIST1 and LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. @@ -1125,7 +1125,7 @@ Keywords supported: :test :test-not :key (autoload 'set-difference "cl-seq" "\ Combine LIST1 and LIST2 using a set-difference operation. -The result list contains all items that appear in LIST1 but not LIST2. +The resulting list contains all items that appear in LIST1 but not LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. @@ -1135,7 +1135,7 @@ Keywords supported: :test :test-not :key (autoload 'nset-difference "cl-seq" "\ Combine LIST1 and LIST2 using a set-difference operation. -The result list contains all items that appear in LIST1 but not LIST2. +The resulting list contains all items that appear in LIST1 but not LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. @@ -1145,7 +1145,7 @@ Keywords supported: :test :test-not :key (autoload 'set-exclusive-or "cl-seq" "\ Combine LIST1 and LIST2 using a set-exclusive-or operation. -The result list contains all items that appear in exactly one of LIST1, LIST2. +The resulting list contains all items appearing in exactly one of LIST1, LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. @@ -1155,7 +1155,7 @@ Keywords supported: :test :test-not :key (autoload 'nset-exclusive-or "cl-seq" "\ Combine LIST1 and LIST2 using a set-exclusive-or operation. -The result list contains all items that appear in exactly one of LIST1, LIST2. +The resulting list contains all items appearing in exactly one of LIST1, LIST2. This is a destructive function; it reuses the storage of LIST1 and LIST2 whenever possible. diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 5113a34e268..d6b4feb1613 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2641,7 +2641,7 @@ will be inserted before the group at point." ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "d98d015a69b22236de3cb1f7e456218b") +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "f6e06ce5f548106a2ffa2f3029ce5eda") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ -- cgit v1.2.3 From 43e9202446ae7e637ee1c36994717a48e08e07d1 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 10 Feb 2011 19:26:43 +0100 Subject: Update cl-loaddefs.el again --- lisp/emacs-lisp/cl-loaddefs.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index badfdcc70b6..835d26ed585 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -282,7 +282,7 @@ Not documented ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "fd4df570f1dcbf83cde740819ae3734a") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "75e86ac663887b54bf1778f2dd028463") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -389,7 +389,7 @@ This is equivalent to `(return-from nil RESULT)'. (autoload 'return-from "cl-macs" "\ Return from the block named NAME. -This jump out to the innermost enclosing `(block NAME ...)' form, +This jumps out to the innermost enclosing `(block NAME ...)' form, returning RESULT from that form (or nil if RESULT is omitted). This is compatible with Common Lisp, but note that `defun' and `defmacro' do not create implicit blocks as they do in Common Lisp. -- cgit v1.2.3 From b762841f959188397404ed752f0f6ed9db5c93fb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 12 Feb 2011 04:17:00 +0100 Subject: Fix trivial typos in comments and ChangeLogs. --- etc/ChangeLog | 2 +- lisp/ChangeLog | 18 +++++++++--------- lisp/cedet/srecode/fields.el | 2 +- lisp/ediff-mult.el | 2 +- lisp/emacs-lisp/checkdoc.el | 2 +- lisp/emulation/cua-base.el | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/textmodes/reftex-index.el | 2 +- src/ChangeLog | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/etc/ChangeLog b/etc/ChangeLog index dc80bcb3964..82020dc3c9c 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -164,7 +164,7 @@ * srecode/doc-default.srt (section-comment, function-comment) (variable-same-line-comment, group-comment-start, group-comment-end): * srecode/doc-java.srt (function-comment, variable-same-line-comment) - (group-comment-start, gropu-comment-end): + (group-comment-start, group-comment-end): Fix typos in template docstrings. 2010-01-14 Kenichi Handa diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec28bbb1eaf..6f2b228eaf8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -376,7 +376,7 @@ (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text. (rmail-mime-insert-image): Argument changed. Caller changed. (rmail-mime-image): Call rmail-mime-toggle-hidden. - (rmail-mime-set-bulk-data): New funciton. + (rmail-mime-set-bulk-data): New function. (rmail-mime-insert-bulk): Argument changed. (rmail-mime-multipart-handler): Return t. (rmail-mime-process-multipart): Argument changed. @@ -1076,7 +1076,7 @@ is indented differently if it is after a begin..end clock. (verilog-in-attribute-p, verilog-skip-backward-comments) (verilog-skip-forward-comment-p): Support proper treatment of - attributes by indent code. Reported by Jeff Steele. + attributes by indent code. Reported by Jeff Steele. (verilog-in-directive-p): Fix comment to correctly describe function. (verilog-backward-up-list, verilog-in-struct-region-p) (verilog-backward-token, verilog-in-struct-p) @@ -1087,9 +1087,9 @@ (verilog-property-re, verilog-endcomment-reason-re) (verilog-beg-of-statement, verilog-set-auto-endcomments) (verilog-calc-1 ): Fix for assert a; else b; indentation (new form - of if). Reported by Max Bjurling and + of if). Reported by Max Bjurling and (verilog-calc-1): Fix for clocking block in modport - declaration. Reported by Brian Hunter. + declaration. Reported by Brian Hunter. 2010-10-23 Wilson Snyder @@ -1105,7 +1105,7 @@ (verilog-read-always-signals-recurse, verilog-read-decls): Fix not treating `elsif similar to `endif inside AUTOSENSE. (verilog-do-indent): Implement correct automatic or static task or - function end comment highlight. Reported by Steve Pearlmutter. + function end comment highlight. Reported by Steve Pearlmutter. (verilog-font-lock-keywords-2): Fix highlighting of single character pins, bug264. Reported by Michael Laajanen. (verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls) @@ -1116,7 +1116,7 @@ Reported by Mark Johnson. (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp): Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF, - bug269. Suggested by Gary Delp. + bug269. Suggested by Gary Delp. (verilog-mode-map, verilog-preprocess, verilog-preprocess-history) (verilog-preprocessor, verilog-set-compile-command): Create verilog-preprocess and verilog-preprocessor to show @@ -1124,7 +1124,7 @@ (verilog-get-beg-of-line, verilog-get-end-of-line) (verilog-modi-file-or-buffer, verilog-modi-name) (verilog-modi-point, verilog-within-string): Move defmacro's - before first use to avoid warning. Reported by Steve Pearlmutter. + before first use to avoid warning. Reported by Steve Pearlmutter. (verilog-colorize-buffer, verilog-colorize-include-files-buffer) (verilog-colorize-region, verilog-highlight-buffer) (verilog-highlight-includes, verilog-highlight-modules) @@ -1156,7 +1156,7 @@ (verilog-alw-get-temps, verilog-auto-reset) (verilog-auto-sense-sigs, verilog-read-always-signals) (verilog-read-always-signals-recurse): Fix loop indexes being - AUTORESET. AUTORESET now assumes any variables in the + AUTORESET. AUTORESET now assumes any variables in the initialization section of a for() should be ignored. Reported by Dan Dever. (verilog-error-font-lock-keywords) @@ -3139,7 +3139,7 @@ 2010-02-03 Michael Albinus * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory - also in case of (and (not full) (not wildcard)). This is needed, + also in case of (and (not full) (not wildcard)). This is needed, when dired is called with a list of files, which are not in `default-directory'. (Bug#5478) diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 9092467a583..817bb93d2fd 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -198,7 +198,7 @@ If SET-TO is a string, then replace the text of OLAID wit SET-TO." (oset ir fields srecode-field-archive) (setq srecode-field-archive nil) - ;; Initailize myself first. + ;; Initialize myself first. (call-next-method) ) diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 6b6996c5dd1..f9ff78977cc 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -306,7 +306,7 @@ buffers." (nth 3 elt)) (defsubst ediff-get-session-objC (elt) (nth 4 elt)) -;; Take the "name" component of the object into acount. ObjA/C/B is of the form +;; Take the "name" component of the object into account. ObjA/C/B is of the form ;; (name . equality-indicator) (defsubst ediff-get-session-objA-name (elt) (car (nth 2 elt))) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 6726e83c77b..70360eb77cf 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1817,7 +1817,7 @@ Replace with \"%s\"? " original replace) (let ((found nil) (start (point)) (msg nil) (ms nil)) (while (and (not msg) (re-search-forward - ;; Ignore manual page refereces like + ;; Ignore manual page references like ;; git-config(1). "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^](']" e t)) diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e590d09b783..60ebefdd155 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -247,7 +247,7 @@ ;; [C-d] Moves (i.e. deletes and inserts) a single character to the ;; global mark. ;; [backspace] deletes the character before the global mark, while -;; [delete] deltes the character after the global mark. +;; [delete] deletes the character after the global mark. ;; [S-C-space] Jumps to and cancels the global mark. ;; [C-u S-C-space] Cancels the global mark (stays in current buffer). diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index b74c8106668..a468c2698a4 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -6088,7 +6088,7 @@ (nntp-retrieve-groups): Ditto for groups. (nntp-retrieve-articles): Ditto for articles. (*): Replaced nntp-possibly-change-group calls to - nntp-with-open-group forms in all, but one, occurrance. + nntp-with-open-group forms in all, but one, occurrence. (nntp-accept-process-output): Bug fix. Detect when called with null process. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 8d17f06c036..bf90d0dce40 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -3499,7 +3499,7 @@ 2003-05-08 Satyaki Das - * mh-seq.el (mh-translate-range): Take into account differnt + * mh-seq.el (mh-translate-range): Take into account different semantics of split-string in Emacs and XEmacs. (mh-read-pick-regexp, mh-narrow-to-from, mh-narrow-to-cc) (mh-narrow-to-to, mh-narrow-to-header-field) diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index d39c4a6adb7..6c37667c3f6 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1901,7 +1901,7 @@ both ends." ((equal char ?\C-g) (keyboard-quit)) ((member char '(?o ?O)) - ;; Select a differnt macro + ;; Select a different macro (let* ((nc (reftex-index-select-phrases-macro 2)) (macro-data (cdr (assoc nc reftex-index-phrases-macro-data))) diff --git a/src/ChangeLog b/src/ChangeLog index 9fbf1841982..f530a8d904e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -114,7 +114,7 @@ (x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal. (ns_set_name_as_filename): Encode name with ENCODE_UTF_8. Always use buffer name for title and buffer filename only for - RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). + RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). 2011-01-03 Eli Zaretskii @@ -264,7 +264,7 @@ * gtkutil.c (menubar_map_cb): New function (Bug#7425). (xg_update_frame_menubar): Connect signal map to menubar_map_cb. - Use 23 as menubar height if 0. (Bug#7425). + Use 23 as menubar height if 0. (Bug#7425). 2010-11-14 Jan Djärv @@ -488,7 +488,7 @@ is more portable. * keyboard.c (gobble_input): Move call of xd_read_queued_messages ... - (kbd_buffer_get_event): ... here. This is needed for cygwin, which + (kbd_buffer_get_event): ... here. This is needed for cygwin, which has not defined SIGIO. 2010-09-27 Michael Albinus @@ -685,7 +685,7 @@ * nsterm.m (ns_draw_fringe_bitmap): Likewise. * fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here. - Take account of bitmap offset. + Take account of bitmap offset. (draw_window_fringes): Take account of window vscroll. (update_window_fringes): Likewise. Extend top-aligned top indicator or bottom-aligned bottom indicator to adjacent rows if it doesn't fit -- cgit v1.2.3