HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TMP] enable load_prefer_newer
[bpt/emacs.git]
/
lisp
/
image-file.el
diff --git
a/lisp/image-file.el
b/lisp/image-file.el
index
e5a07c2
..
55074a8
100644
(file)
--- a/
lisp/image-file.el
+++ b/
lisp/image-file.el
@@
-1,17
+1,16
@@
;;; image-file.el --- support for visiting image files
;;
;;; image-file.el --- support for visiting image files
;;
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: multimedia
;; This file is part of GNU Emacs.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: multimedia
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+18,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-39,8
+36,8
@@
;;;###autoload
(defcustom image-file-name-extensions
;;;###autoload
(defcustom image-file-name-extensions
-
'("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg"
)
- "
*
A list of image-file filename extensions.
+
(purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")
)
+ "A list of image-file filename extensions.
Filenames having one of these extensions are considered image files,
in addition to those matching `image-file-name-regexps'.
Filenames having one of these extensions are considered image files,
in addition to those matching `image-file-name-regexps'.
@@
-59,7
+56,7
@@
the variable is set using \\[customize]."
;;;###autoload
(defcustom image-file-name-regexps nil
;;;###autoload
(defcustom image-file-name-regexps nil
- "
*
List of regexps matching image-file filenames.
+ "List of regexps matching image-file filenames.
Filenames matching one of these regexps are considered image files,
in addition to those with an extension in `image-file-name-extensions'.
Filenames matching one of these regexps are considered image files,
in addition to those with an extension in `image-file-name-extensions'.
@@
-181,11
+178,12
@@
Optional argument ARGS are the arguments to call FUNCTION with."
;;;###autoload
(define-minor-mode auto-image-file-mode
;;;###autoload
(define-minor-mode auto-image-file-mode
- "Toggle visiting of image files as images.
-With prefix argument ARG, turn on if positive, otherwise off.
-Returns non-nil if the new state is enabled.
+ "Toggle visiting of image files as images (Auto Image File mode).
+With a prefix argument ARG, enable Auto Image File mode if ARG is
+positive, and disable it otherwise. If called from Lisp, enable
+the mode if ARG is omitted or nil.
-
Image files are thos
e whose name has an extension in
+
An image file is on
e whose name has an extension in
`image-file-name-extensions', or matches a regexp in
`image-file-name-regexps'."
:global t
`image-file-name-extensions', or matches a regexp in
`image-file-name-regexps'."
:global t
@@
-204,5
+202,4
@@
Image files are those whose name has an extension in
(provide 'image-file)
(provide 'image-file)
-;; arch-tag: 04cafe36-f7ba-4c80-9f47-4cb656520ce1
;;; image-file.el ends here
;;; image-file.el ends here