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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/11 04:02:19

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : calendar.el 

Log message:
        (calendar-window-list): Ignore invisible windows.
        (calendar-set-mode-line): Fall back to a default width if we seem to be
        called from daemon.  (Bug#2199)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15297&r2=1.15298
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.279&r2=1.280

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15297
retrieving revision 1.15298
diff -u -b -r1.15297 -r1.15298
--- ChangeLog   11 Feb 2009 02:24:51 -0000      1.15297
+++ ChangeLog   11 Feb 2009 04:02:16 -0000      1.15298
@@ -1,3 +1,13 @@
+2009-02-11  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (calendar-window-list): Ignore invisible windows.
+       (calendar-set-mode-line): Fall back to a default width if we seem to be
+       called from daemon.  (Bug#2199)
+
+       * mail/rmailkwd.el (rmail-make-label): Doc fix.
+       (rmail-read-label): Add current labels to completion list.  (Bug#2222)
+       (rmail-set-label): Use `or'.
+
 2009-02-11  Chong Yidong  <address@hidden>
 
        * emacs-lisp/find-func.el (find-library-name, find-library): Doc

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -b -r1.279 -r1.280
--- calendar/calendar.el        9 Feb 2009 17:26:21 -0000       1.279
+++ calendar/calendar.el        11 Feb 2009 04:02:19 -0000      1.280
@@ -1723,10 +1723,13 @@
   "List of all calendar-related windows."
   (let ((calendar-buffers (calendar-buffer-list))
         list)
+    ;; Using 0 rather than t for last argument - see bug#2199.
+    ;; This is only used with calendar-hide-window, which ignores
+    ;; iconified frames anyway, so could use 'visible rather than 0.
     (walk-windows (lambda (w)
                     (if (memq (window-buffer w) calendar-buffers)
                         (push w list)))
-                  nil t)
+                  nil 0)
     list))
 
 (defun calendar-buffer-list ()
@@ -2461,6 +2464,11 @@
   (let* ((edges (window-edges))
          ;; As per doc of window-width, total visible mode-line length.
          (width (- (nth 2 edges) (car edges))))
+    ;; Hack for --daemon.  See bug #2199.
+    ;; If no frame exists yet, we have no idea what width to use.
+    (and (= width 10)
+         (not window-system)
+         (setq width (or (getenv "COLUMNS") 80)))
     (setq mode-line-format
           (if buffer-file-name
               `("-" mode-line-modified