emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp ChangeLog calendar/diary-lib.el


From: Glenn Morris
Subject: [Emacs-diffs] emacs/lisp ChangeLog calendar/diary-lib.el
Date: Sat, 05 Sep 2009 21:11:38 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/05 21:11:38

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : diary-lib.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16103&r2=1.16104
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.188&r2=1.189

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16103
retrieving revision 1.16104
diff -u -b -r1.16103 -r1.16104
--- ChangeLog   5 Sep 2009 21:07:15 -0000       1.16103
+++ ChangeLog   5 Sep 2009 21:11:34 -0000       1.16104
@@ -1,5 +1,10 @@
 2009-09-05  Glenn Morris  <address@hidden>
 
+       * 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.
 

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- calendar/diary-lib.el       4 Sep 2009 02:59:15 -0000       1.188
+++ calendar/diary-lib.el       5 Sep 2009 21:11:37 -0000       1.189
@@ -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))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]