Re: Your Emacs changes

[Matt Hodges <MPHodges@member.fsf.org>]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

>>>>> Richard Stallman writes:

 > We can install your Emacs changes now.  Could you send them to
 > emacs-devel again, with ChangeLog entries?

This is mainly calendar stuff.

There is also a suggestion to add an optional argument to
list-faces-display, and a few doc fixes.

(Is the reference to dired-marked-files in man/dired.texi obsolete?)

Thanks.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Emacs diffs. --]
[-- Type: text/x-patch, Size: 14600 bytes --]

Index: man/fixit.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/fixit.texi,v
retrieving revision 1.17
diff -u -r1.17 fixit.texi
--- man/fixit.texi	13 Aug 2004 01:26:44 -0000	1.17
+++ man/fixit.texi	31 Jan 2005 14:32:58 -0000
@@ -159,7 +159,7 @@
 @table @kbd
 @item M-x flyspell-mode
 Enable Flyspell mode, which highlights all misspelled words.
-@item M-x flyspell-progmode
+@item M-x flyspell-prog-mode
 Enable Flyspell mode for comments and strings only.
 @item M-$
 Check and correct spelling of the word at point (@code{ispell-word}).
Index: man/calendar.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/calendar.texi,v
retrieving revision 1.24
diff -u -r1.24 calendar.texi
--- man/calendar.texi	21 Jan 2005 20:49:30 -0000	1.24
+++ man/calendar.texi	31 Jan 2005 14:32:58 -0000
@@ -291,7 +291,9 @@
 @item C-c C-l
 Regenerate the calendar window (@code{redraw-calendar}).
 @item SPC
-Scroll the next window (@code{scroll-other-window}).
+Scroll the next window up (@code{scroll-other-window}).
+@item DEL
+Scroll the next window down (@code{scroll-other-window-down}).
 @item q
 Exit from calendar (@code{exit-calendar}).
 @end table
@@ -314,8 +316,9 @@
 
 @kindex SPC @r{(Calendar mode)}
   In Calendar mode, you can use @kbd{SPC} (@code{scroll-other-window})
-to scroll the other window.  This is handy when you display a list of
-holidays or diary entries in another window.
+to scroll the other window up and @kbd{DEL} (@code{scroll-other-window-down})
+to scroll the other window down.  This is handy when you display a list
+of holidays or diary entries in another window.
 
 @kindex q @r{(Calendar mode)}
 @findex exit-calendar
@@ -437,8 +440,8 @@
 @findex list-calendar-holidays
   To get even more detailed information, use the @kbd{a} command, which
 displays a separate buffer containing a list of all holidays in the
-current three-month range.  You can use @key{SPC} in the calendar window
-to scroll that list.
+current three-month range.  You can use @key{SPC} and @key{DEL} in the
+calendar window to scroll that list up and down.
 
 @findex holidays
   The command @kbd{M-x holidays} displays the list of holidays for the
@@ -861,7 +864,7 @@
 @noindent
 Thus, the long count date 12.16.11.16.6 means 12 baktun, 16 katun, 11
 tun, 16 uinal, and 6 kin.  The Emacs calendar can handle Mayan long
-count dates as early as 7.17.18.13.1, but no earlier.  When you use the
+count dates as early as 7.17.18.13.3, but no earlier.  When you use the
 @kbd{g m l} command, type the Mayan long count date with the baktun,
 katun, tun, uinal, and kin separated by periods.
 
@@ -1510,11 +1513,14 @@
 
 @findex timeclock-in
 @findex timeclock-out
+@findex timeclock-change
 @findex timeclock-workday-remaining
 @findex timeclock-when-to-leave
   Use the @kbd{M-x timeclock-in} command when you start working on a
 project, and @kbd{M-x timeclock-out} command when you're done.  Each
-time you do this, it adds one time interval to the record of the project.
+time you do this, it adds one time interval to the record of the
+project.  You can change to working on a different project with @kbd{M-x
+timeclock-change}.
 
   Once you've collected data from a number of time intervals, you can use
 @kbd{M-x timeclock-workday-remaining} to see how much time is left to
@@ -1529,12 +1535,13 @@
 @code{t}, or invoke the @kbd{M-x timeclock-modeline-display} command.
 
 @vindex timeclock-ask-before-exiting
-  Terminating the current Emacs session might or might not mean that
-you have stopped working on the project.  If you'd like Emacs to ask
-you about this, set the value of the variable
-@code{timeclock-ask-before-exiting} to @code{t} (via @kbd{M-x
-customize}).  By default, only an explicit @kbd{M-x timeclock-out}
-tells Emacs that the current interval is over.
+  Terminating the current Emacs session might or might not mean that you
+have stopped working on the project and, by default, Emacs queries this.
+However, you can set the value of the variable
+@code{timeclock-ask-before-exiting} to @code{nil} (via @kbd{M-x
+customize}) to avoid this behaviour; then, only an explicit @kbd{M-x
+timeclock-out} or @kbd{M-x timeclock-change} will tell Emacs that the
+current interval is over.
 
 @cindex @file{.timelog} file
 @vindex timeclock-file
Index: man/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/man/ChangeLog,v
retrieving revision 1.451
diff -u -r1.451 ChangeLog
--- man/ChangeLog	30 Jan 2005 14:47:11 -0000	1.451
+++ man/ChangeLog	31 Jan 2005 14:32:58 -0000
@@ -1,3 +1,15 @@
+2005-01-31  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* fixit.texi (Spelling): Fix typo.
+
+2005-01-31  Matt Hodges <MPHodges@member.fsf.org>
+	
+	* calendar.texi (General Calendar): Document binding of
+	scroll-other-window-down.
+	(Mayan Calendar): Fix earliest date.
+	(Time Intervals): Document timeclock-change.
+	(Time Intervals): Fix timeclock-ask-before-exiting documentation.
+
 2005-01-30  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* custom.texi (Easy Customization): Adapt menu to node name change.
Index: lispref/edebug.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/edebug.texi,v
retrieving revision 1.23
diff -u -r1.23 edebug.texi
--- lispref/edebug.texi	16 Feb 2004 22:16:53 -0000	1.23
+++ lispref/edebug.texi	31 Jan 2005 14:32:58 -0000
@@ -801,7 +801,7 @@
 
 @defopt edebug-print-circle
 If non-@code{nil}, Edebug binds @code{print-circle} to this value while
-printing results.  The default value is @code{nil}.
+printing results.  The default value is @code{t}.
 @end defopt
 
   Other programs can also use custom printing; see @file{cust-print.el}
@@ -909,7 +909,7 @@
 @example
 (defun fac (n)
   (if (= n 0) (edebug))
-;#6           1      0 =5
+;#6           1      = =5
   (if (< 0 n)
 ;#5         =
       (* n (fac (1- n)))
Index: lispref/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/ChangeLog,v
retrieving revision 1.305
diff -u -r1.305 ChangeLog
--- lispref/ChangeLog	29 Jan 2005 14:05:34 -0000	1.305
+++ lispref/ChangeLog	31 Jan 2005 14:32:59 -0000
@@ -1,3 +1,9 @@
+2005-01-31  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* edebug.texi (Printing in Edebug): Fix default value of
+	edebug-print-circle.
+	(Coverage Testing): Fix displayed frequency count data.
+
 2005-01-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* commands.texi (Misc Events): Describe the help-echo event.
Index: lisp/calendar/calendar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.160
diff -u -r1.160 calendar.el
--- lisp/calendar/calendar.el	20 Dec 2004 18:09:46 -0000	1.160
+++ lisp/calendar/calendar.el	31 Jan 2005 14:32:59 -0000
@@ -140,12 +140,25 @@
   :prefix "calendar-"
   :group 'calendar)
 
+(defconst calendar-buffer "*Calendar*"
+  "Name of the buffer used for the calendar.")
 
 ;;;###autoload
 (defcustom calendar-week-start-day 0
   "*The day of the week on which a week in the calendar begins.
-0 means Sunday (default), 1 means Monday, and so on."
+0 means Sunday (default), 1 means Monday, and so on.
+
+If you change this variable directly after starting `calendar',
+you should call `redraw-calendar' to update the calendar display
+to reflect the change, otherwise movement commands will not work
+correctly."
   :type 'integer
+  :set (lambda (sym val)
+         (set sym val)
+         (let ((buffer (get-buffer calendar-buffer)))
+           (when (buffer-live-p buffer)
+             (with-current-buffer buffer
+               (redraw-calendar)))))
   :group 'calendar)
 
 ;;;###autoload
@@ -1303,9 +1316,6 @@
   :type 'sexp
   :group 'holidays)
 
-(defconst calendar-buffer "*Calendar*"
-  "Name of the buffer used for the calendar.")
-
 (defconst holiday-buffer "*Holidays*"
   "Name of the buffer used for the displaying the holidays.")
 
@@ -1572,6 +1582,11 @@
           (const :tag "use current frame" nil))
   :group 'calendar)
 
+(defcustom calendar-minimum-window-height 8
+  "Minimum height that the calendar window should use."
+  :type 'integer
+  :group 'calendar)
+
 ;;;###autoload
 (defun calendar (&optional arg)
   "Choose between the one frame, two frame, or basic calendar displays.
@@ -2039,28 +2054,33 @@
           (or (not mon)
               (let ((offset (calendar-interval mon yr month year)))
                 (and (<= offset 1) (>= offset -1)))))
-         (day-in-week (calendar-day-of-week today)))
+         (day-in-week (calendar-day-of-week today))
+         (in-calendar-window (eq (window-buffer (selected-window))
+                                 (get-buffer calendar-buffer))))
     (update-calendar-mode-line)
     (if mon
         (generate-calendar mon yr)
-        (generate-calendar month year))
+      (generate-calendar month year))
     (calendar-cursor-to-visible-date
      (if today-visible today (list displayed-month 1 displayed-year)))
     (set-buffer-modified-p nil)
-    (if (or (one-window-p t) (/= (frame-width) (window-width)))
-	;; Don't mess with the window size, but ensure that the first
-	;; line is fully visible
-	(set-window-vscroll nil 0)
-      ;; Adjust the window to exactly fit the displayed calendar
-      (fit-window-to-buffer))
-    (sit-for 0)
+    ;; Don't do any window-related stuff if we weren't called from a
+    ;; window displaying the calendar
+    (when in-calendar-window
+      (if (or (one-window-p t) (/= (frame-width) (window-width)))
+          ;; Don't mess with the window size, but ensure that the first
+          ;; line is fully visible
+          (set-window-vscroll nil 0)
+        ;; Adjust the window to exactly fit the displayed calendar
+        (fit-window-to-buffer nil nil calendar-minimum-window-height))
+      (sit-for 0))
     (if (and (boundp 'font-lock-mode)
 	     font-lock-mode)
 	(font-lock-fontify-buffer))
     (and mark-holidays-in-calendar
 ;;;         (calendar-date-is-legal-p today) ; useful for BC dates
          (mark-calendar-holidays)
-         (sit-for 0))
+         (when in-calendar-window (sit-for 0)))
     (unwind-protect
         (if mark-diary-entries-in-calendar (mark-diary-entries))
       (if today-visible
@@ -2074,7 +2094,7 @@
 ;;; stands, almost all other calendar functions (eg holidays) would 
 ;;; at best have unpredictable results for such dates.
   (if (< (+ month (* 12 (1- year))) 2)
-      (error "Months before February, 1 AD are not available"))
+      (error "Months before January, 1 AD cannot be displayed"))
   (setq displayed-month month
         displayed-year year)
   (erase-buffer)
@@ -2229,6 +2249,7 @@
   (define-key calendar-mode-map "S"   'calendar-sunrise-sunset)
   (define-key calendar-mode-map "M"   'calendar-phases-of-moon)
   (define-key calendar-mode-map " "   'scroll-other-window)
+  (define-key calendar-mode-map "\C-?" 'scroll-other-window-down)
   (define-key calendar-mode-map "\C-c\C-l" 'redraw-calendar)
   (define-key calendar-mode-map "."   'calendar-goto-today)
   (define-key calendar-mode-map "o"   'calendar-other-month)
Index: lisp/faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.299
diff -u -r1.299 faces.el
--- lisp/faces.el	1 Jan 2005 14:21:37 -0000	1.299
+++ lisp/faces.el	31 Jan 2005 14:32:59 -0000
@@ -1143,15 +1143,26 @@
 ;; conflict with Lucid, which uses that name differently.
 
 (defvar help-xref-stack)
-(defun list-faces-display ()
+(defun list-faces-display (&optional regexp)
   "List all faces, using the same sample text in each.
 The sample text is a string that comes from the variable
-`list-faces-sample-text'."
-  (interactive)
+`list-faces-sample-text'.
+
+If REGEXP is non-nil, list only those faces with names matching
+this regular expression.  When called interactively with a prefix
+arg, prompt for a regular expression."
+  (interactive (list (and current-prefix-arg
+                          (read-string "List faces matching regexp: "))))
   (let ((faces (sort (face-list) #'string-lessp))
-	(face nil)
 	(frame (selected-frame))
 	disp-frame window face-name)
+    (when (> (length regexp) 0)
+      (setq faces
+            (delq nil
+                  (mapcar (lambda (f)
+                            (when (string-match regexp (symbol-name f))
+                              f))
+                          faces))))
     (with-output-to-temp-buffer "*Faces*"
       (save-excursion
 	(set-buffer standard-output)
@@ -1164,9 +1175,7 @@
 	   "\\[help-follow] on a face name to customize it\n"
 	   "or on its sample text for a description of the face.\n\n")))
 	(setq help-xref-stack nil)
-	(while faces
-	  (setq face (car faces))
-	  (setq faces (cdr faces))
+	(dolist (face faces)
 	  (setq face-name (symbol-name face))
 	  (insert (format "%25s " face-name))
 	  ;; Hyperlink to a customization buffer for the face.  Using
@@ -1203,10 +1212,8 @@
     (setq disp-frame (if window (window-frame window)
 		       (car (frame-list))))
     (or (eq frame disp-frame)
-	(let ((faces (face-list)))
-	  (while faces
-	    (copy-face (car faces) (car faces) frame disp-frame)
-	    (setq faces (cdr faces)))))))
+        (dolist (face faces)
+          (copy-face face face frame disp-frame)))))
 
 (defun describe-face (face &optional frame)
   "Display the properties of face FACE on FRAME.
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.6940
diff -u -r1.6940 ChangeLog
--- lisp/ChangeLog	31 Jan 2005 11:54:36 -0000	1.6940
+++ lisp/ChangeLog	31 Jan 2005 14:33:01 -0000
@@ -1,3 +1,19 @@
+2005-01-31  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* faces.el (list-faces-display): Add optional argument.
+
+2005-01-31  Matt Hodges <MPHodges@member.fsf.org>
+
+	* calendar/calendar.el (calendar-buffer): Move above
+	calendar-week-start-day.
+	(calendar-week-start-day): Doc fix.  Add :set function.
+	(generate-calendar-window): Don't resize window if selected-window
+	is not displaying the calendar buffer.
+	(calendar-minimum-window-height): New variable.
+	(generate-calendar-window): Use it.
+	(calendar-mode-map): Bind DEL to scroll-other-window-down.
+	(generate-calendar): More precise error message.
+
 2005-01-31  Richard M. Stallman  <rms@gnu.org>
 
 	* textmodes/ispell.el (ispell-local-dictionary-overridden): New var.

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel