From 65821e224463a3d39034b7f31d54baf229a26e81 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 5 Feb 2011 23:59:06 -0500 Subject: [PATCH 01/15] * lisp/files.el (copy-directory): New arg COPY-AS-SUBDIR. If nil, don't copy as a subdirectory. --- lisp/ChangeLog | 6 ++++++ lisp/files.el | 53 +++++++++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6fcef76911c..8306a29846e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-02-06 Chong Yidong + Thierry Volpiatto + + * files.el (copy-directory): New arg COPY-AS-SUBDIR. If nil, + don't copy as a subdirectory. + 2011-02-05 Glenn Morris * emacs-lisp/cl-macs.el (return-from): Fix doc typo. diff --git a/lisp/files.el b/lisp/files.el index d896020b27b..7ac88f88851 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4723,21 +4723,23 @@ If RECURSIVE is non-nil, all files in DIRECTORY are deleted as well." directory 'full directory-files-no-dot-files-regexp))) (delete-directory-internal directory))))) -(defun copy-directory (directory newname &optional keep-time parents) +(defun copy-directory (directory newname &optional keep-time + parents copy-as-subdir) "Copy DIRECTORY to NEWNAME. Both args must be strings. -If NEWNAME names an existing directory, copy DIRECTORY as subdirectory there. - This function always sets the file modes of the output files to match the corresponding input file. The third arg KEEP-TIME non-nil means give the output files the same last-modified time as the old ones. (This works on only some systems.) - A prefix arg makes KEEP-TIME non-nil. -Noninteractively, the last argument PARENTS says whether to -create parent directories if they don't exist. Interactively, -this happens by default." +Optional arg PARENTS says whether to create parent directories if +they don't exist. When called interactively, PARENTS is t. + +When NEWNAME is an existing directory, copy DIRECTORY into a +subdirectory of NEWNAME if optional arg COPY-AS-SUBDIR is +non-nil, otherwise copy the contents of DIRECTORY into NEWNAME. +When called interactively, copy into a subdirectory by default." (interactive (let ((dir (read-directory-name "Copy directory: " default-directory default-directory t nil))) @@ -4745,7 +4747,7 @@ this happens by default." (read-file-name (format "Copy directory %s to: " dir) default-directory default-directory nil nil) - current-prefix-arg t))) + current-prefix-arg t t))) ;; If default-directory is a remote directory, make sure we find its ;; copy-directory handler. (let ((handler (or (find-file-name-handler directory 'copy-directory) @@ -4757,12 +4759,17 @@ this happens by default." (setq directory (directory-file-name (expand-file-name directory)) newname (directory-file-name (expand-file-name newname))) - (if (not (file-directory-p newname)) - ;; If NEWNAME is not an existing directory, create it; that - ;; is where we will copy the files of DIRECTORY. - (make-directory newname parents) - ;; If NEWNAME is an existing directory, we will copy into - ;; NEWNAME/[DIRECTORY-BASENAME]. + (unless (file-directory-p directory) + (error "%s is not a directory" directory)) + + (cond + ((not (file-directory-p newname)) + ;; If NEWNAME is not an existing directory, create it; + ;; that is where we will copy the files of DIRECTORY. + (make-directory newname parents)) + (copy-as-subdir + ;; If NEWNAME is an existing directory, and we are copying as + ;; a subdirectory, the target is NEWNAME/[DIRECTORY-BASENAME]. (setq newname (expand-file-name (file-name-nondirectory (directory-file-name directory)) @@ -4771,20 +4778,22 @@ this happens by default." (not (file-directory-p newname)) (error "Cannot overwrite non-directory %s with a directory" newname)) - (make-directory newname t)) + (make-directory newname t))) ;; Copy recursively. (dolist (file ;; We do not want to copy "." and "..". (directory-files directory 'full directory-files-no-dot-files-regexp)) - (if (file-directory-p file) - (copy-directory file newname keep-time parents) - (let ((target (expand-file-name (file-name-nondirectory file) newname)) - (attrs (file-attributes file))) - (if (stringp (car attrs)) ; Symbolic link - (make-symbolic-link (car attrs) target t) - (copy-file file target t keep-time))))) + (let ((target (expand-file-name + (file-name-nondirectory file) newname)) + (attrs (file-attributes file))) + (cond ((file-directory-p file) + (copy-directory file target keep-time parents nil)) + ((stringp (car attrs)) ; Symbolic link + (make-symbolic-link (car attrs) target t)) + (t + (copy-file file target t keep-time))))) ;; Set directory attributes. (set-file-modes newname (file-modes directory)) From 3caced0bc3b0db2265e053812aba317673bd7c95 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 7 Feb 2011 09:41:11 -0800 Subject: [PATCH 02/15] * lisp/simple.el (next-error): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8306a29846e..5d8de616108 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-07 Glenn Morris + + * simple.el (next-error): Doc fix. + 2011-02-06 Chong Yidong Thierry Volpiatto diff --git a/lisp/simple.el b/lisp/simple.el index d267089214c..6e26e334372 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -305,8 +305,8 @@ runs `next-error-hook' with `run-hooks', and stays with that buffer until you use it in some other buffer which uses Compilation mode or Compilation Minor mode. -See variables `compilation-parse-errors-function' and -\`compilation-error-regexp-alist' for customization ideas." +To control which errors are matched, customize the variable +`compilation-error-regexp-alist'." (interactive "P") (if (consp arg) (setq reset t arg nil)) (when (setq next-error-last-buffer (next-error-find-buffer)) From 8a6f24e5f283563fc25a8bc088d314034699f286 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 7 Feb 2011 20:10:15 -0800 Subject: [PATCH 03/15] faces.el fix for bug#7966. * lisp/faces.el (face-attr-match-p): Handle the obsolete :bold and :italic props, so that frame-set-background-mode works. (Otherwise such faces were always thought to be locally modified.) --- lisp/ChangeLog | 5 +++++ lisp/faces.el | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d8de616108..8f6f2ee821b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Glenn Morris + + * faces.el (face-attr-match-p): Handle the obsolete :bold and + :italic props, so that frame-set-background-mode works. (Bug#7966) + 2011-02-07 Glenn Morris * simple.el (next-error): Doc fix. diff --git a/lisp/faces.el b/lisp/faces.el index 4a4acefa04c..cc1847a2164 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1605,13 +1605,25 @@ Optional parameter FRAME is the frame whose definition of FACE is used. If nil or omitted, use the selected frame." (unless frame (setq frame (selected-frame))) - (let ((list face-attribute-name-alist) - (match t)) + (let* ((list face-attribute-name-alist) + (match t) + (bold (and (plist-member attrs :bold) + (not (plist-member attrs :weight)))) + (italic (and (plist-member attrs :italic) + (not (plist-member attrs :slant)))) + (plist (if (or bold italic) + (copy-sequence attrs) + attrs))) + ;; Handle the Emacs 20 :bold and :italic properties. + (if bold + (plist-put plist :weight (if bold 'bold 'normal))) + (if italic + (plist-put plist :slant (if italic 'italic 'normal))) (while (and match (not (null list))) (let* ((attr (car (car list))) (specified-value - (if (plist-member attrs attr) - (plist-get attrs attr) + (if (plist-member plist attr) + (plist-get plist attr) 'unspecified)) (value-now (face-attribute face attr frame))) (setq match (equal specified-value value-now)) From 9aabf64c78017a55dedab5481ed20776c57f284b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 8 Feb 2011 08:19:20 +0100 Subject: [PATCH 04/15] * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become zero. Fixes: debbugs:7348 --- src/ChangeLog | 5 +++++ src/nsterm.m | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 2b02030fd4f..2df187383a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Jan Djärv + + * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become + zero (Bug#7348). + 2011-02-03 Glenn Morris * xfaces.c (Finternal_set_lisp_face_attribute): diff --git a/src/nsterm.m b/src/nsterm.m index addb6d01d71..30b73c2fd13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5721,6 +5721,7 @@ + (CGFloat) scrollerWidth win = nwin; condemned = NO; pixel_height = NSHeight (r); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; frame = XFRAME (XWINDOW (win)->frame); @@ -5750,6 +5751,7 @@ - (void)setFrame: (NSRect)newRect NSTRACE (EmacsScroller_setFrame); /* BLOCK_INPUT; */ pixel_height = NSHeight (newRect); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; [super setFrame: newRect]; [self display]; From bae1fa42dc24348d6ba303b633a3cf19dec625fa Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 8 Feb 2011 19:11:15 -0500 Subject: [PATCH 05/15] Fix to select_window. http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00346.html * window.c (select_window): Check inhibit_point_swap argument when deciding whether to return immediately. --- src/ChangeLog | 5 +++++ src/window.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2df187383a4..9fbf1841982 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Martin Rudalics + + * window.c (select_window): Check inhibit_point_swap argument when + deciding whether to return immediately. + 2011-02-08 Jan Djärv * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become diff --git a/src/window.c b/src/window.c index 12775ffa7d4..3e6062a7153 100644 --- a/src/window.c +++ b/src/window.c @@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap) XSETFASTINT (w->use_time, window_select_count); } - if (EQ (window, selected_window)) + if (EQ (window, selected_window) && !inhibit_point_swap) return window; sf = SELECTED_FRAME (); From dc4c6a7add965cbe7d0b9a357f9403defa96c0da Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Feb 2011 19:24:46 -0800 Subject: [PATCH 06/15] * lisp/ediff-ptch.el (ediff-fixup-patch-map): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/ediff-ptch.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f6f2ee821b..7d460219db0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-10 Glenn Morris + + * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. + 2011-02-08 Glenn Morris * faces.el (face-attr-match-p): Handle the obsolete :bold and diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index a9e19c79bab..26de8ca5828 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -417,7 +417,7 @@ Ediff has inferred that are two possible targets for applying the patch. Both files seem to be plausible alternatives. -Please advice: +Please advise: Type `y' to use %s as the target; Type `n' to use %s as the target. " From 86361e1edcf4ae6a602a32ee32dba16a3470f407 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Feb 2011 21:07:32 -0800 Subject: [PATCH 07/15] 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/ChangeLog | 4 ++++ lisp/emacs-lisp/cl-seq.el | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d460219db0..852a73735f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-02-10 Glenn Morris + * emacs-lisp/cl-seq.el (union, nunion, intersection) + (nintersection, set-difference, nset-difference) + (set-exclusive-or, nset-exclusive-or): Doc fix. + * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. 2011-02-08 Glenn Morris 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 From 16b737dc09bfb9cce1f3b0f8e51ace7d6f4e651a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 10 Feb 2011 12:07:15 +0100 Subject: [PATCH 08/15] 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(-) 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" "\ From 43e9202446ae7e637ee1c36994717a48e08e07d1 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 10 Feb 2011 19:26:43 +0100 Subject: [PATCH 09/15] Update cl-loaddefs.el again --- lisp/emacs-lisp/cl-loaddefs.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 4d46072b29fa32b9d5823135900f86a884c56e2f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 11 Feb 2011 19:21:25 -0500 Subject: [PATCH 10/15] Bind delete-by-moving-to-trash to nil in EPA and EPG. This should not be merged into the trunk. * epa-file.el (epa-file-insert-file-contents): Likewise. * epg.el (epg-delete-output-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): Bind delete-by-moving-to-trash to nil. --- lisp/ChangeLog | 8 ++++++++ lisp/epa-file.el | 3 ++- lisp/epg.el | 18 ++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 852a73735f6..ec28bbb1eaf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-02-12 Chong Yidong + + * epg.el (epg-delete-output-file, epg-decrypt-string) + (epg-verify-string, epg-sign-string, epg-encrypt-string): Bind + delete-by-moving-to-trash to nil. + + * epa-file.el (epa-file-insert-file-contents): Likewise. + 2011-02-10 Glenn Morris * emacs-lisp/cl-seq.el (union, nunion, intersection) diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 6c577448512..c5c43a724e8 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -149,7 +149,8 @@ way." (set-visited-file-modtime)))) (if (and local-copy (file-exists-p local-copy)) - (delete-file local-copy))) + (let ((delete-by-moving-to-trash nil)) + (delete-file local-copy)))) (list file length))) (put 'insert-file-contents 'epa-file 'epa-file-insert-file-contents) diff --git a/lisp/epg.el b/lisp/epg.el index 673109b2015..3bda4502a7f 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1215,7 +1215,8 @@ This function is for internal use only." "Delete the output file of CONTEXT." (if (and (epg-context-output-file context) (file-exists-p (epg-context-output-file context))) - (delete-file (epg-context-output-file context)))) + (let ((delete-by-moving-to-trash nil)) + (delete-file (epg-context-output-file context))))) (eval-and-compile (if (fboundp 'decode-coding-string) @@ -1904,7 +1905,8 @@ You can then use `write-region' to write new data into the file." ;; Cleanup the tempfile. (and tempfile (file-exists-p tempfile) - (delete-file tempfile)) + (let ((delete-by-moving-to-trash nil)) + (delete-file tempfile))) ;; Cleanup the tempdir. (and tempdir (file-directory-p tempdir) @@ -2004,7 +2006,8 @@ If PLAIN is nil, it returns the result as a string." (epg-read-output context)) (epg-delete-output-file context) (if (file-exists-p input-file) - (delete-file input-file)) + (let ((delete-by-moving-to-trash nil)) + (delete-file input-file))) (epg-reset context)))) (defun epg-start-verify (context signature &optional signed-text) @@ -2101,7 +2104,8 @@ successful verification." (epg-delete-output-file context) (if (and input-file (file-exists-p input-file)) - (delete-file input-file)) + (let ((delete-by-moving-to-trash nil)) + (delete-file input-file))) (epg-reset context)))) (defun epg-start-sign (context plain &optional mode) @@ -2208,7 +2212,8 @@ Otherwise, it makes a cleartext signature." (epg-read-output context)) (epg-delete-output-file context) (if input-file - (delete-file input-file)) + (let ((delete-by-moving-to-trash nil)) + (delete-file input-file))) (epg-reset context)))) (defun epg-start-encrypt (context plain recipients @@ -2328,7 +2333,8 @@ If RECIPIENTS is nil, it performs symmetric encryption." (epg-read-output context)) (epg-delete-output-file context) (if input-file - (delete-file input-file)) + (let ((delete-by-moving-to-trash nil)) + (delete-file input-file))) (epg-reset context)))) (defun epg-start-export-keys (context keys) From b762841f959188397404ed752f0f6ed9db5c93fb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 12 Feb 2011 04:17:00 +0100 Subject: [PATCH 11/15] 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(-) 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 From cb191a14ce7507c5131c36625e34f462180f4c33 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Feb 2011 04:47:28 -0500 Subject: [PATCH 12/15] Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames. terminal.c (create_terminal): Use default-keyboard-coding-system and default-terminal-coding-system to initialize coding systems of the new terminal. --- src/ChangeLog | 6 ++++++ src/terminal.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f530a8d904e..b90a9c02e8b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Eli Zaretskii + + * terminal.c (create_terminal): Use default-keyboard-coding-system + and default-terminal-coding-system to initialize coding systems of + the new terminal. (Bug#7840) + 2011-02-09 Martin Rudalics * window.c (select_window): Check inhibit_point_swap argument when diff --git a/src/terminal.c b/src/terminal.c index 041dc28f977..a51a18c934d 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -226,6 +226,7 @@ struct terminal * create_terminal (void) { struct terminal *terminal = allocate_terminal (); + Lisp_Object terminal_coding, keyboard_coding; terminal->name = NULL; terminal->next_terminal = terminal_list; @@ -238,8 +239,22 @@ create_terminal (void) terminal->terminal_coding = (struct coding_system *) xmalloc (sizeof (struct coding_system)); - setup_coding_system (Qno_conversion, terminal->keyboard_coding); - setup_coding_system (Qundecided, terminal->terminal_coding); + /* If default coding systems for the terminal and the keyboard are + already defined, use them in preference to the defaults. This is + needed when Emacs runs in daemon mode. */ + keyboard_coding = SYMBOL_VALUE (intern ("default-keyboard-coding-system")); + if (NILP (keyboard_coding) + || EQ (keyboard_coding, Qunbound) + || NILP (Fcoding_system_p (keyboard_coding))) + keyboard_coding = Qno_conversion; + terminal_coding = SYMBOL_VALUE (intern ("default-terminal-coding-system")); + if (NILP (terminal_coding) + || EQ (terminal_coding, Qunbound) + || NILP (Fcoding_system_p (terminal_coding))) + terminal_coding = Qundecided; + + setup_coding_system (keyboard_coding, terminal->keyboard_coding); + setup_coding_system (terminal_coding, terminal->terminal_coding); terminal->param_alist = Qnil; return terminal; From 20fac86e2e61bf25c1f2c6e6c1cac27b994a5346 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 12 Feb 2011 14:43:04 -0500 Subject: [PATCH 13/15] * lisp/files.el (copy-directory): Revert to pre-2011-01-29 version. --- lisp/ChangeLog | 4 ++++ lisp/files.el | 64 ++++++++++++++++---------------------------------- 2 files changed, 24 insertions(+), 44 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f2b228eaf8..b77700491c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-12 Chong Yidong + + * files.el (copy-directory): Revert to pre-2011-01-29 version. + 2011-02-12 Chong Yidong * epg.el (epg-delete-output-file, epg-decrypt-string) diff --git a/lisp/files.el b/lisp/files.el index 7ac88f88851..b026bf3352f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4723,23 +4723,19 @@ If RECURSIVE is non-nil, all files in DIRECTORY are deleted as well." directory 'full directory-files-no-dot-files-regexp))) (delete-directory-internal directory))))) -(defun copy-directory (directory newname &optional keep-time - parents copy-as-subdir) +(defun copy-directory (directory newname &optional keep-time parents) "Copy DIRECTORY to NEWNAME. Both args must be strings. This function always sets the file modes of the output files to match the corresponding input file. The third arg KEEP-TIME non-nil means give the output files the same last-modified time as the old ones. (This works on only some systems.) + A prefix arg makes KEEP-TIME non-nil. -Optional arg PARENTS says whether to create parent directories if -they don't exist. When called interactively, PARENTS is t. - -When NEWNAME is an existing directory, copy DIRECTORY into a -subdirectory of NEWNAME if optional arg COPY-AS-SUBDIR is -non-nil, otherwise copy the contents of DIRECTORY into NEWNAME. -When called interactively, copy into a subdirectory by default." +Noninteractively, the last argument PARENTS says whether to +create parent directories if they don't exist. Interactively, +this happens by default." (interactive (let ((dir (read-directory-name "Copy directory: " default-directory default-directory t nil))) @@ -4747,7 +4743,7 @@ When called interactively, copy into a subdirectory by default." (read-file-name (format "Copy directory %s to: " dir) default-directory default-directory nil nil) - current-prefix-arg t t))) + current-prefix-arg t))) ;; If default-directory is a remote directory, make sure we find its ;; copy-directory handler. (let ((handler (or (find-file-name-handler directory 'copy-directory) @@ -4758,42 +4754,22 @@ When called interactively, copy into a subdirectory by default." ;; Compute target name. (setq directory (directory-file-name (expand-file-name directory)) newname (directory-file-name (expand-file-name newname))) - - (unless (file-directory-p directory) - (error "%s is not a directory" directory)) - - (cond - ((not (file-directory-p newname)) - ;; If NEWNAME is not an existing directory, create it; - ;; that is where we will copy the files of DIRECTORY. - (make-directory newname parents)) - (copy-as-subdir - ;; If NEWNAME is an existing directory, and we are copying as - ;; a subdirectory, the target is NEWNAME/[DIRECTORY-BASENAME]. - (setq newname (expand-file-name - (file-name-nondirectory - (directory-file-name directory)) - newname)) - (and (file-exists-p newname) - (not (file-directory-p newname)) - (error "Cannot overwrite non-directory %s with a directory" - newname)) - (make-directory newname t))) + (if (not (file-directory-p newname)) (make-directory newname parents)) ;; Copy recursively. - (dolist (file - ;; We do not want to copy "." and "..". - (directory-files directory 'full - directory-files-no-dot-files-regexp)) - (let ((target (expand-file-name - (file-name-nondirectory file) newname)) - (attrs (file-attributes file))) - (cond ((file-directory-p file) - (copy-directory file target keep-time parents nil)) - ((stringp (car attrs)) ; Symbolic link - (make-symbolic-link (car attrs) target t)) - (t - (copy-file file target t keep-time))))) + (mapc + (lambda (file) + (let ((target (expand-file-name + (file-name-nondirectory file) newname)) + (attrs (file-attributes file))) + (cond ((file-directory-p file) + (copy-directory file target keep-time parents)) + ((stringp (car attrs)) ; Symbolic link + (make-symbolic-link (car attrs) target t)) + (t + (copy-file file target t keep-time))))) + ;; We do not want to copy "." and "..". + (directory-files directory 'full directory-files-no-dot-files-regexp)) ;; Set directory attributes. (set-file-modes newname (file-modes directory)) From 43aa28e2a2d2970177fda44b1c269524df756a33 Mon Sep 17 00:00:00 2001 From: Ulrich Mueller Date: Sat, 12 Feb 2011 17:06:22 -0500 Subject: [PATCH 14/15] * url.texi: Remove duplicate @dircategory (Bug#7942). --- doc/misc/ChangeLog | 4 ++++ doc/misc/url.texi | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 49054b327a8..6c03e6cda92 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-12 Ulrich Mueller + + * url.texi: Remove duplicate @dircategory (Bug#7942). + 2011-02-03 Michael Albinus * tramp.texi (Frequently Asked Questions): Mention problems with diff --git a/doc/misc/url.texi b/doc/misc/url.texi index e1dc3d38e23..b8b8f67204b 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -12,7 +12,6 @@ \overfullrule=0pt %\global\baselineskip 30pt % for printing in double space @end tex -@dircategory World Wide Web @dircategory Emacs @direntry * URL: (url). URL loading package. From 165bc5a066990bace024c04ba431f140a25d0bfd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 12 Feb 2011 14:12:04 -0800 Subject: [PATCH 15/15] * doc/misc/sc.texi (Getting Connected): Remove old index entries. --- doc/misc/ChangeLog | 4 ++++ doc/misc/sc.texi | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 6c03e6cda92..d87bb9f8dc9 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-12 Glenn Morris + + * sc.texi (Getting Connected): Remove old index entries. + 2011-02-12 Ulrich Mueller * url.texi: Remove duplicate @dircategory (Bug#7942). diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index b85c9e88715..8ac2a9a2dcd 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -752,8 +752,6 @@ interface specifications, or if you are writing or maintaining an MUA, @cindex .emacs file @findex sc-cite-original @findex cite-original (sc-) -@findex sc-submit-bug-report -@findex submit-bug-report (sc-) The first thing that everyone should do, regardless of the MUA you are using is to set up Emacs so it will load Supercite at the appropriate time. This happens automatically if Supercite is distributed with your