Mercurial > emacs
diff lisp/files.el @ 83279:2006100ee57e
Merged from miles@gnu.org--gnu-2005 (patch 204-213)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-204
Clean up gdb-ui breakpoint faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-205
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-206
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-207
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-208
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-209
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-210
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-211
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-212
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-213
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-319
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 27 Mar 2005 17:29:43 +0000 |
| parents | 26c9034f3533 641ee5af213b |
| children | 360860a0006f |
line wrap: on
line diff
--- a/lisp/files.el Wed Mar 23 13:35:08 2005 +0000 +++ b/lisp/files.el Sun Mar 27 17:29:43 2005 +0000 @@ -1777,8 +1777,8 @@ ("\\.tar\\'" . tar-mode) ;; The list of archive file extensions should be in sync with ;; `auto-coding-alist' with `no-conversion' coding system. - ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\)\\'" . archive-mode) - ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\)\\'" . archive-mode) + ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . archive-mode) + ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . archive-mode) ("\\.sx[dmicw]\\'" . archive-mode) ; OpenOffice.org ;; Mailer puts message to be edited in ;; /tmp/Re.... or Message @@ -3422,7 +3422,7 @@ "Save some modified file-visiting buffers. Asks user about each one. You can answer `y' to save, `n' not to save, `C-r' to look at the buffer in question with `view-buffer' before deciding or `d' to -view the differences using `diff-buffer-to-file'. +view the differences using `diff-buffer-with-file'. Optional argument (the prefix) non-nil means save all with no questions. Optional second argument PRED determines which buffers are considered: