merge trunk

8 files changed, 53 insertions, 62 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15bd4b190b2..d1ec662bac8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2011-05-20  Nix  <nix@esperi.org.uk>
+
+        * files.el (basic-save-buffer-2):
+        Fix handling of break-hardlink-on-save with non-existent files.
+
+2011-05-19  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil.
+        (rcirc-markup-urls): Check if rcirc-url-regexp is nil.
+
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-type-def-re):
+        Handle "type, bind(c)".  (Bug#8691)
+
+        * emacs-lisp/autoload.el (batch-update-autoloads):
+        Set autoload-excludes by parsing loadup.el rather than Makefiles.
+
 2011-05-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-process-actions): Set "first-password-request"
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index f8f8d9b00f2..6d5067151d3 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -769,52 +769,21 @@ Calls `update-directory-autoloads' on the command line arguments.
 Definitions are written to `generated-autoload-file' (which
 should be non-nil)."
   ;; For use during the Emacs build process only.
+  ;; Exclude those files that are preloaded on ALL platforms.
+  ;; These are the ones in loadup.el where "(load" is at the start
+  ;; of the line (crude, but it works).
   (unless autoload-excludes
-    (let* ((ldir (file-name-directory generated-autoload-file))
-           (default-directory
-             (file-name-as-directory
-              (expand-file-name (if (eq system-type 'windows-nt)
-                                    "../lib-src"
-                                  "../src") ldir)))
-           (mfile "Makefile")
-           (tmpfile "echolisp.tmp")
-           lim)
-      ;; Windows uses the 'echolisp' approach because:
-      ;; i) It does not have $lisp as a single simple definition, so
-      ;; it would be harder to parse the Makefile.
-      ;; ii) It can, since it already has $lisp broken up into pieces
-      ;; that the command-line can handle.
-      ;; Non-Windows builds do not use the 'echolisp' approach because
-      ;; no-one knows (?) the maximum safe command-line length on all
-      ;; supported systems.  $lisp is much longer there since it uses
-      ;; absolute paths, and it would seem a shame to split it just for this.
-      (when (file-readable-p mfile)
-        (if (eq system-type 'windows-nt)
-            (when (ignore-errors
-                   (if (file-exists-p tmpfile) (delete-file tmpfile))
-                   ;; FIXME call-process is better, if it works.
-                   (shell-command (format "%s echolisp > %s"
-                                          autoload-make-program tmpfile))
-                   (file-readable-p tmpfile))
-              (with-temp-buffer
-                (insert-file-contents tmpfile)
-                ;; FIXME could be a single while loop.
-                (while (not (eobp))
-                  (setq lim (line-end-position))
-                  (while (re-search-forward "\\([^ ]+\\.el\\)c?\\>" lim t)
-                    (push (expand-file-name (match-string 1))
-                          autoload-excludes))
-                  (forward-line 1))))
-          (with-temp-buffer
-            (insert-file-contents mfile)
-            (when (re-search-forward "^shortlisp= " nil t)
-              (while (and (not lim)
-                          (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>"
-                                             nil t))
-                (push (expand-file-name (match-string 1) ldir)
-                      autoload-excludes)
-                (skip-chars-forward " \t")
-                (if (eolp) (setq lim t)))))))))
+    (let ((default-directory (file-name-directory generated-autoload-file))
+          file)
+      (when (file-readable-p "loadup.el")
+        (with-temp-buffer
+          (insert-file-contents "loadup.el")
+          (while (re-search-forward "^(load \"\\([^\"]+\\)\"" nil t)
+            (setq file (match-string 1))
+            (or (string-match "\\.el\\'" file)
+                (setq file (format "%s.el" file)))
+            (or (string-match "\\`site-" file)
+                (push (expand-file-name file) autoload-excludes)))))))
   (let ((args command-line-args-left))
     (setq command-line-args-left nil)
     (apply 'update-directory-autoloads args)))
diff --git a/lisp/files.el b/lisp/files.el
index 336a0a436f9..200b9b1d303 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4517,6 +4517,7 @@ Before and after saving the buffer, this function runs
            (dir-writable (file-writable-p dir)))
       (if (or (and file-precious-flag dir-writable)
               (and break-hardlink-on-save
+                   (file-exists-p buffer-file-name)
                    (> (file-nlinks buffer-file-name) 1)
                    (or dir-writable
                        (error (concat (format
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 66f30f03eff..2b51637e3d1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading
+        whitespace in base64 data lines.
+
 2011-05-18  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-registry.el (gnus-registry-user-format-function-M):
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 9952f410f0d..695451ddc45 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -197,7 +197,8 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
                (while (re-search-forward "^[\t ]*\r?\n" nil t)
                  (delete-region (match-beginning 0) (match-end 0)))
                (goto-char (point-max))
-               (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t)
+               (when (re-search-backward "^[\t ]*[A-Za-z0-9+/]+=*[\t ]*$"
+                                         nil t)
                  (forward-line))
                (point))))
            ((memq encoding '(nil 7bit 8bit binary))
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d348456ae32..525b8d27b8d 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -29,21 +29,15 @@
 ;; If you add/remove Lisp files to be loaded here, consider the
 ;; following issues:
 
-;; i) Any file loaded on all platforms should appear in $lisp
-;; and $shortlisp in src/Makefile.in.  Use the .el or .elc version as
-;; appropriate.
+;; i) Any file loaded on any platform should appear in $lisp in src/lisp.mk.
+;; Use the .el or .elc version as appropriate.
 
-;; ii) Any file that is only loaded on some platforms should appear
-;; in the version of $lisp in the generated Makefile on that platform.
-;; At the present time, this is achieved by use of #ifdefs.
-;; It should also appear in $SOME_MACHINE_LISP on all platforms.
+;; This ensures both that the Lisp files are compiled (if necessary)
+;; before the emacs executable is dumped, and that they are passed to
+;; make-docfile.  (Any that are not processed for DOC will not have
+;; doc strings in the dumped Emacs.)  Because of this:
 
-;; The above steps ensure both that the Lisp files are compiled (if
-;; necessary) before the emacs executable is dumped, and that they are
-;; passed to make-docfile.  (Any that are not processed for DOC will
-;; not have doc strings in the dumped Emacs.)  Because of this:
-
-;; iii) If the file is loaded uncompiled, it should (where possible)
+;; ii) If the file is loaded uncompiled, it should (where possible)
 ;; obey the doc-string conventions expected by make-docfile.
 
 ;;; Code:
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 206ebc8997c..0d02688beed 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -971,7 +971,7 @@ This number is independent of the number of lines in the buffer.")
   (set (make-local-variable 'rcirc-current-line) 0)
 
   (set (make-local-variable 'rcirc-short-buffer-name) nil)
-  (set (make-local-variable 'rcirc-urls) t)
+  (set (make-local-variable 'rcirc-urls) nil)
 
   ;; setup for omitting responses
   (setq buffer-invisibility-spec '())
@@ -2394,7 +2394,8 @@ keywords when no KEYWORD is given."
         (rcirc-record-activity (current-buffer) 'nick)))))
 
 (defun rcirc-markup-urls (sender response)
-  (while (re-search-forward rcirc-url-regexp nil t)
+  (while (and rcirc-url-regexp ;; nil means disable URL catching
+              (re-search-forward rcirc-url-regexp nil t))
     (let ((start (match-beginning 0))
           (end (match-end 0)))
       (rcirc-add-face start end 'rcirc-url)
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 53aa95498da..e9bb43c4d6d 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -809,8 +809,10 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
   ;; type word
   ;; type :: word
   ;; type, stuff :: word
+  ;; type, bind(c) :: word
   ;; NOT "type ("
-  "\\<\\(type\\)\\>\\(?:[^()\n]*::\\)?[ \t]*\\(\\sw+\\)"
+  "\\<\\(type\\)\\>\\(?:\\(?:[^()\n]*\\|\
+.*,[ \t]*bind[ \t]*([ \t]*c[ \t]*)[ \t]*\\)::\\)?[ \t]*\\(\\sw+\\)"
   "Regexp matching the definition of a derived type.")
 
 (defconst f90-typeis-re