* lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.

[gnu-emacs] / lisp / autoinsert.el

diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 92a5f9f3f929f2c9c2bf6d906ed32b1cefec0b70..9a8001875e0bc65b941815540cfe6793155606a8 100644 (file)
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,7 +1,7 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
@@ -126,10 +126,10 @@ If this contains a %s, that will be replaced by the matching rule."
      _ "\n\\begin{document}\n" _
      "\n\\end{document}")
 
-    (("/bin/.*[^/]\\'" . "Shell-Script mode magic number")
-     lambda ()
-       (if (eq major-mode default-major-mode)
-        (sh-mode)))
+    (("/bin/.*[^/]\\'" . "Shell-Script mode magic number") .
+     (lambda ()
+       (if (eq major-mode (default-value 'major-mode))
+          (sh-mode))))
 
     (ada-mode . ada-header)
 
@@ -343,19 +343,19 @@ Matches the visited file name against the elements of `auto-insert-alist'."
 
         ;; Now, if we found something, do it
         (and action
-             (if (stringp action)
-                 (file-readable-p (concat auto-insert-directory action))
-               t)
-             (if auto-insert-query
-                 (or (if (eq auto-insert-query 'function)
-                         (eq this-command 'auto-insert))
-                     (y-or-n-p (format auto-insert-prompt desc)))
-               t)
+             (or (not (stringp action))
+                  (file-readable-p (expand-file-name
+                                    action auto-insert-directory)))
+             (or (not auto-insert-query)
+                  (if (eq auto-insert-query 'function)
+                      (eq this-command 'auto-insert))
+                  (y-or-n-p (format auto-insert-prompt desc)))
              (mapc
               (lambda (action)
                 (if (stringp action)
                     (if (file-readable-p
-                         (setq action (concat auto-insert-directory action)))
+                         (setq action (expand-file-name
+                                        action auto-insert-directory)))
                         (insert-file-contents action))
                   (save-window-excursion
                     ;; make buffer visible before skeleton or function
@@ -393,8 +393,7 @@ or if CONDITION had no actions, after all other CONDITIONs."
                    (vector action (cdr elt)))))
       (if after
          (nconc auto-insert-alist (list (cons condition action)))
-       (setq auto-insert-alist (cons (cons condition action)
-                                     auto-insert-alist))))))
+        (push (cons condition action) auto-insert-alist)))))
 
 ;;;###autoload
 (define-minor-mode auto-insert-mode