(auto-mode-alist): Add \\' to doc-view files regexp.

Remove duplicate entry .x[bp]m accidently added by the latest sync from Emacs-22.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3318099623a..fa482db4711 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-23  Juri Linkov  <juri@jurta.org>
+
+        * man.el (Man-follow-manual-reference): Fill the minibuffer's
+        default list with a full list of references.
+
+        * files.el (auto-mode-alist): Add \\' to doc-view files regexp.
+
 2007-12-23  Andreas Schwab  <schwab@suse.de>
 
         * files.el (switch-to-buffer-other-frame): Return the buffer
diff --git a/lisp/files.el b/lisp/files.el
index e475f4350ba..70a07ea5eff 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2057,7 +2057,6 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . java-mode)           ; javascript-mode would be better
-     ("\\.x[bp]m\\'" . c-mode)
      ("\\.d?v\\'" . verilog-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.
@@ -2075,7 +2074,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
      ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG
      ("\\.[eE]?[pP][sS]\\'" . ps-mode)
-     ("\\.\\(?:PDF\\|DVI\\|pdf\\|dvi\\)" . doc-view-mode)
+     ("\\.\\(?:PDF\\|DVI\\|pdf\\|dvi\\)\\'" . doc-view-mode)
      ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode)
      ("BROWSE\\'" . ebrowse-tree-mode)
      ("\\.ebrowse\\'" . ebrowse-tree-mode)