(find-file-noselect-1): Return the buffer we created

even if it has been killed within `after-find-file'.

(auto-mode-alist): Use ada-mode for .ad[bs].dg files.

1 files changed, 10 insertions, 8 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 51b2ca50387..4930d6a96a0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1283,14 +1283,15 @@ that are visiting the various files."
            (progn
              (make-local-variable 'backup-inhibited)
              (setq backup-inhibited t)))
-      (if rawfile
-          (progn
-            (set-buffer-multibyte nil)
-            (setq buffer-file-coding-system 'no-conversion)
-            (make-local-variable 'find-file-literally)
-            (setq find-file-literally t))
-        (after-find-file error (not nowarn)))
-      (current-buffer))))
+      (let ((buffer (current-buffer)))
+        (if rawfile
+            (progn
+              (set-buffer-multibyte nil)
+              (setq buffer-file-coding-system 'no-conversion)
+              (make-local-variable 'find-file-literally)
+              (setq find-file-literally t))
+          (after-find-file error (not nowarn)))
+        buffer))))
 
 (defun insert-file-contents-literally (filename &optional visit beg end replace)
   "Like `insert-file-contents', but only reads in the file literally.
@@ -1472,6 +1473,7 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.p\\'" . pascal-mode)
      ("\\.pas\\'" . pascal-mode)
      ("\\.ad[abs]\\'" . ada-mode)
+     ("\\.ad[bs].dg\\'" . ada-mode)
      ("\\.\\([pP]\\([Llm]\\|erl\\)\\|al\\)\\'" . perl-mode)
      ("\\.s?html?\\'" . html-mode)
      ("\\.cc\\'" . c++-mode)