mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

Minor iimage.el changes.

Browse Source 
* lisp/iimage.el (iimage-version): Remove.
(iimage-mode-image-search-path, iimage-mode-image-regex-alist):
Turn into defcustoms.
(iimage-mode-map): Give it a doc string.
This commit is contained in:
Glenn Morris 2010-10-06 19:32:52 -07:00
parent 7e1e2a6e32
commit 52da218259
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,5 +1,10 @@
2010-10-07 Glenn Morris <rgm@gnu.org> 2010-10-07 Glenn Morris <rgm@gnu.org>
* iimage.el (iimage-version): Remove.
(iimage-mode-image-search-path, iimage-mode-image-regex-alist):
Turn into defcustoms.
(iimage-mode-map): Give it a doc string.
* calendar/appt.el (appt-activate): Give a warning rather than an error * calendar/appt.el (appt-activate): Give a warning rather than an error
if there is no diary-file. if there is no diary-file.

54
lisp/iimage.el
View File

@ -1,6 +1,7 @@
;;; iimage.el --- Inline image minor mode. ;;; iimage.el --- Inline image minor mode.
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: KOSEKI Yoshinori <kose@meadowy.org> ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
@ -27,20 +28,16 @@
;; exists in the buffer. ;; exists in the buffer.
;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html ;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html
;; ;;
;; Add to your `~/.emacs':
;; (autoload 'iimage-mode "iimage" "Support Inline image minor mode." t)
;; (autoload 'turn-on-iimage-mode "iimage" "Turn on Inline image minor mode." t)
;;
;; ** Display images in *Info* buffer. ;; ** Display images in *Info* buffer.
;; ;;
;; (add-hook 'info-mode-hook 'turn-on-iimage-mode) ;; (add-hook 'info-mode-hook 'iimage-mode)
;; ;;
;; .texinfo: @file{file://foo.png} ;; .texinfo: @file{file://foo.png}
;; .info: `file://foo.png' ;; .info: `file://foo.png'
;; ;;
;; ** Display images in Wiki buffer. ;; ** Display images in Wiki buffer.
;; ;;
;; (add-hook 'wiki-mode-hook 'turn-on-iimage-mode) ;; (add-hook 'wiki-mode-hook 'iimage-mode)
;; ;;
;; wiki-file: [[foo.png]] ;; wiki-file: [[foo.png]]
@ -54,19 +51,10 @@
:version "22.1" :version "22.1"
:group 'image) :group 'image)
(defconst iimage-version "1.1") (defcustom iimage-mode-image-search-path nil
"List of directories to search for image files for iimage-mode."
(defvar iimage-mode-map :type '(choice (const nil) (repeat directory))
(let ((map (make-sparse-keymap))) :group 'iimage)
(define-key map "\C-l" 'iimage-recenter)
map))
(defun iimage-recenter (&optional arg)
"Re-draw images and recenter."
(interactive "P")
(iimage-mode-buffer nil)
(iimage-mode-buffer t)
(recenter arg))
(defvar iimage-mode-image-filename-regex (defvar iimage-mode-image-filename-regex
(concat "[-+./_0-9a-zA-Z]+\\." (concat "[-+./_0-9a-zA-Z]+\\."
@ -75,23 +63,36 @@
image-file-name-extensions) image-file-name-extensions)
t))) t)))
(defvar iimage-mode-image-regex-alist (defcustom iimage-mode-image-regex-alist
`((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?"
"\\(" iimage-mode-image-filename-regex "\\)" "\\(" iimage-mode-image-filename-regex "\\)"
"\\(\\]\\]\\|>\\|'\\)?") . 2)) "\\(\\]\\]\\|>\\|'\\)?") . 2))
"*Alist of filename REGEXP vs NUM. "Alist of filename REGEXP vs NUM.
Each element looks like (REGEXP . NUM). Each element looks like (REGEXP . NUM).
NUM specifies which parenthesized expression in the regexp. NUM specifies which parenthesized expression in the regexp.
Examples of image filename regexps: Examples of image filename patterns to match:
file://foo.png file://foo.png
`file://foo.png' `file://foo.png'
\\[\\[foo.gif]] \\[\\[foo.gif]]
<foo.png> <foo.png>
foo.JPG") foo.JPG
"
:type '(alist :key-type regexp :value-type integer)
:group 'iimage)
(defvar iimage-mode-image-search-path nil (defvar iimage-mode-map
"*List of directories to search for image files for `iimage-mode'.") (let ((map (make-sparse-keymap)))
(define-key map "\C-l" 'iimage-recenter)
map)
"Keymap used in `iimage-mode'.")
(defun iimage-recenter (&optional arg)
"Re-draw images and recenter."
(interactive "P")
(iimage-mode-buffer nil)
(iimage-mode-buffer t)
(recenter arg))
;;;###autoload ;;;###autoload
(define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1")
@ -144,5 +145,4 @@ Examples of image filename regexps:
(provide 'iimage) (provide 'iimage)
;; arch-tag: f6f8e29a-08f6-4a12-9496-51e67441ce65
;;; iimage.el ends here ;;; iimage.el ends here