Merged from miles@gnu.org--gnu-2005 (patch 474)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-377

3 files changed, 24 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a40afc7733a..f5dbc71ff97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * replace.el (occur-rename-buffer): Use `generate-new-buffer' also
+        when called non-interactively.  Doc fix.
+
+2005-07-07  Lute Kamstra  <lute@gnu.org>
+
+        * elide-head.el (elide-head-headers-to-hide): Recognize the FSF's
+        new address as well.
+
 2005-07-07  Kenichi Handa  <handa@m17n.org>
 
         * international/mule.el (make-coding-system): Describe
@@ -6,13 +16,13 @@
         ascii-incompatible.
         (set-keyboard-coding-system): Likewise.
 
-        * international/mule-cmds.el (set-default-coding-systems): Don't
-        set default-file-name-coding-system and
+        * international/mule-cmds.el (set-default-coding-systems):
+        Don't set default-file-name-coding-system and
         default-keyboard-coding-system if coding-system is
         ASCII-incompatible.
 
         * international/utf-16.el: Declare that all UTF-16-based coding
-        systems ASCII-incompatible.
+        systems are ASCII-incompatible.
 
 2005-07-07  Nick Roberts  <nickrob@snap.net.nz>
 
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index f47e9e871ea..86e3365c5dd 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -53,9 +53,9 @@
 
 (defcustom elide-head-headers-to-hide
   '(("is free software; you can redistribute it" . ; GNU boilerplate
-     "Boston, MA 02111-1307, USA\\.")
+     "Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\.")
     ("The Regents of the University of California\\.  All rights reserved\\." .
-     "SUCH DAMAGE\\.")                  ; BSD
+     "SUCH DAMAGE\\.")                                ; BSD
     ("Permission is hereby granted, free of charge" . ; X11
      "authorization from the X Consortium\\."))
   "Alist of regexps defining start end end of text to elide.
diff --git a/lisp/replace.el b/lisp/replace.el
index 4b745d54433..a8ef61e828d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -921,21 +921,22 @@ If the value is nil, don't highlight the buffer names specially."
         (when current-prefix-arg
           (prefix-numeric-value current-prefix-arg))))
 
-(defun occur-rename-buffer (&optional unique-p)
+(defun occur-rename-buffer (&optional unique-p interactive-p)
   "Rename the current *Occur* buffer to *Occur: original-buffer-name*.
-Here `original-buffer-name' is the buffer name were occur was originally run.
-When given the prefix argument, the renaming will not clobber the existing
-buffer(s) of that name, but use `generate-new-buffer-name' instead.
-You can add this to `occur-mode-hook' if you always want a separate *Occur*
-buffer for each buffer where you invoke `occur'."
-  (interactive "P")
+Here `original-buffer-name' is the buffer name were Occur was originally run.
+When given the prefix argument, or called non-interactively, the renaming
+will not clobber the existing buffer(s) of that name, but use
+`generate-new-buffer-name' instead.  You can add this to `occur-hook'
+if you always want a separate *Occur* buffer for each buffer where you
+invoke `occur'."
+  (interactive "P\np")
   (with-current-buffer
       (if (eq major-mode 'occur-mode) (current-buffer) (get-buffer "*Occur*"))
     (rename-buffer (concat "*Occur: "
                            (mapconcat #'buffer-name
                                       (car (cddr occur-revert-arguments)) "/")
                            "*")
-                   unique-p)))
+                   (or unique-p (not interactive-p)))))
 
 (defun occur (regexp &optional nlines)
   "Show all lines in the current buffer containing a match for REGEXP.