Mercurial > emacs
changeset 104865:68c0ccdf0374
(diary-entry): Add help-echo and follow-link properties to this button.
(diary-fancy-display): Don't extend the button to the final newline.
(diary-fancy-display-mode): Continue to define "q" as a local key.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 05 Sep 2009 21:11:34 +0000 |
| parents | f1938074431e |
| children | 3d5d2850cbef |
| files | lisp/ChangeLog lisp/calendar/diary-lib.el |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 05 21:07:15 2009 +0000 +++ b/lisp/ChangeLog Sat Sep 05 21:11:34 2009 +0000 @@ -1,5 +1,10 @@ 2009-09-05 Glenn Morris <rgm@gnu.org> + * calendar/diary-lib.el (diary-entry): Add help-echo and follow-link + properties to this button. + (diary-fancy-display): Don't extend the button to the final newline. + (diary-fancy-display-mode): Continue to define "q" as a local key. + * calendar/cal-china.el (holiday-chinese): Make it slightly more efficient.
--- a/lisp/calendar/diary-lib.el Sat Sep 05 21:07:15 2009 +0000 +++ b/lisp/calendar/diary-lib.el Sat Sep 05 21:11:34 2009 +0000 @@ -908,9 +908,9 @@ (define-obsolete-function-alias 'simple-diary-display 'diary-simple-display "23.1") -(define-button-type 'diary-entry - 'action #'diary-goto-entry - 'face 'diary-button) +(define-button-type 'diary-entry 'action #'diary-goto-entry + 'face 'diary-button 'help-echo "Find this diary entry" + 'follow-link t) (defun diary-goto-entry (button) "Jump to the diary entry for the BUTTON at point." @@ -1000,7 +1000,7 @@ this-loc marks temp-face) (unless (zerop (length this-entry)) (if (setq this-loc (nth 3 entry)) - (insert-button (concat this-entry "\n") + (insert-button this-entry ;; (MARKER FILENAME SPECIFIER LITERAL) 'locator (list (car this-loc) (cadr this-loc) @@ -1008,7 +1008,8 @@ (or (nth 2 this-loc) (nth 1 entry))) :type 'diary-entry) - (insert this-entry ?\n)) + (insert this-entry)) + (insert ?\n) ;; Doesn't make sense to check font-lock-mode - see ;; comments above diary-entry-marker in calendar.el. (and ; font-lock-mode @@ -2362,6 +2363,7 @@ t nil nil nil (font-lock-fontify-region-function . diary-fancy-font-lock-fontify-region-function))) + (local-set-key "q" 'quit-window) (set (make-local-variable 'minor-mode-overriding-map-alist) (list (cons t diary-fancy-overriding-map))) (view-mode 1))