aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Dahl2006-07-24 16:27:17 +0000
committerMathias Dahl2006-07-24 16:27:17 +0000
commit41fdf678d891780ff8cbad1f50e51499b32af4dd (patch)
tree01336ab860d394efea394127e340b204e9769d51
parentdca90550b93437560a6c989ab3c2bed0a7333fd4 (diff)
downloademacs-41fdf678d891780ff8cbad1f50e51499b32af4dd.tar.gz
emacs-41fdf678d891780ff8cbad1f50e51499b32af4dd.zip
(tumme-write-tags): Add.
(tumme-write-comments): Add. (tumme-tag-files): Change to use `tumme-write-tags'. (tumme-tag-thumbnail): Change to use `tumme-write-tags'. (tumme-dired-comment-files): Change to use `tumme-write-comments'. (tumme-save-information-from-widgets): Change to use `tumme-write-comments' and `tumme-write-tags'. (tumme-comment-thumbnail): Change to use `tumme-write-comments'. (tumme-write-tag): Remove. (tumme-write-comment): Remove. (tumme-display-previous-thumbnail-original): Remove empty line. (tumme-widget-list): Add punctuation.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/tumme.el16
2 files changed, 9 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a957b289d2..bbd780d2f66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,7 @@
11 (tumme-write-tag): Remove. 11 (tumme-write-tag): Remove.
12 (tumme-write-comment): Remove. 12 (tumme-write-comment): Remove.
13 (tumme-display-previous-thumbnail-original): Remove empty line. 13 (tumme-display-previous-thumbnail-original): Remove empty line.
14 (tumme-widget-list): Add punctuation.
14 15
152006-07-24 mathias <mathias.dahl@gmail.com> 162006-07-24 mathias <mathias.dahl@gmail.com>
16 17
diff --git a/lisp/tumme.el b/lisp/tumme.el
index d7fae222aa2..c9f9b83ef32 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -84,7 +84,7 @@
84;; USAGE 84;; USAGE
85;; ===== 85;; =====
86;; 86;;
87;; This information has been moved to the manual. Type `C-h r' to open 87;; This information has been moved to the manual. Type `C-h r' to open
88;; the Emacs manual and go to the node Thumbnails by typing `g 88;; the Emacs manual and go to the node Thumbnails by typing `g
89;; Thumbnails RET'. 89;; Thumbnails RET'.
90;; 90;;
@@ -648,7 +648,7 @@ according to the Thumbnail Managing Standard."
648 ;; Can't use (overlays-at (point)), BUG? 648 ;; Can't use (overlays-at (point)), BUG?
649 (overlays-in (point) (1+ (point))))) 649 (overlays-in (point) (1+ (point)))))
650 (put-image thumb-file image-pos) 650 (put-image thumb-file image-pos)
651 (setq 651 (setq
652 overlay 652 overlay
653 (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o)) 653 (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
654 (overlays-in (point) (1+ (point))))))) 654 (overlays-in (point) (1+ (point)))))))
@@ -2431,7 +2431,7 @@ when using per-directory thumbnail file storage"))
2431 (kill-buffer buffer))) 2431 (kill-buffer buffer)))
2432 2432
2433(defvar tumme-widget-list nil 2433(defvar tumme-widget-list nil
2434 "List to keep track of meta data in edit buffer") 2434 "List to keep track of meta data in edit buffer.")
2435 2435
2436;;;###autoload 2436;;;###autoload
2437(defun tumme-dired-edit-comment-and-tags () 2437(defun tumme-dired-edit-comment-and-tags ()
@@ -2449,7 +2449,7 @@ easy-to-use form."
2449 (erase-buffer)) 2449 (erase-buffer))
2450 (remove-overlays) 2450 (remove-overlays)
2451 ;; Some help for the user. 2451 ;; Some help for the user.
2452 (widget-insert 2452 (widget-insert
2453"\nEdit comments and tags for each image. Separate multiple tags 2453"\nEdit comments and tags for each image. Separate multiple tags
2454with a comma. Move forward between fields using TAB or RET. 2454with a comma. Move forward between fields using TAB or RET.
2455Move to the previous field using backtab (S-TAB). Save by 2455Move to the previous field using backtab (S-TAB). Save by
@@ -2483,15 +2483,15 @@ the operation by activating the Cancel button.\n\n")
2483 ",") ""))) 2483 ",") "")))
2484 ;; Save information in all widgets so that we can use it when 2484 ;; Save information in all widgets so that we can use it when
2485 ;; the user saves the form. 2485 ;; the user saves the form.
2486 (setq tumme-widget-list 2486 (setq tumme-widget-list
2487 (append tumme-widget-list 2487 (append tumme-widget-list
2488 (list (list file comment-widget tag-widget)))) 2488 (list (list file comment-widget tag-widget))))
2489 (widget-insert "\n\n"))) 2489 (widget-insert "\n\n")))
2490 2490
2491 ;; Footer with Save and Cancel button. 2491 ;; Footer with Save and Cancel button.
2492 (widget-insert "\n") 2492 (widget-insert "\n")
2493 (widget-create 'push-button 2493 (widget-create 'push-button
2494 :notify 2494 :notify
2495 (lambda (&rest ignore) 2495 (lambda (&rest ignore)
2496 (tumme-save-information-from-widgets) 2496 (tumme-save-information-from-widgets)
2497 (bury-buffer) 2497 (bury-buffer)
@@ -2499,7 +2499,7 @@ the operation by activating the Cancel button.\n\n")
2499 "Save") 2499 "Save")
2500 (widget-insert " ") 2500 (widget-insert " ")
2501 (widget-create 'push-button 2501 (widget-create 'push-button
2502 :notify 2502 :notify
2503 (lambda (&rest ignore) 2503 (lambda (&rest ignore)
2504 (bury-buffer) 2504 (bury-buffer)
2505 (message "Operation canceled.")) 2505 (message "Operation canceled."))