[Emacs-diffs] trunk r118088: Drop support for deprecated (since 23.1) forms of diary-display-function

[Glenn Morris]

------------------------------------------------------------
revno: 118088
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-10 19:54:11 -0700
message:
  Drop support for deprecated (since 23.1) forms of diary-display-function
  
  * lisp/calendar/diary-lib.el (diary-display-function):
  Drop support for deprecated nil and list forms.
  (diary-list-entries): Update for the above.
  
  * lisp/calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly.
modified:
  etc/NEWS                       news-20141002041645-34n5fasbwydbo8t6-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/cal-x.el         calx.el-20091113204419-o5vbwnq5f7feedwu-818
  lisp/calendar/diary-lib.el     diarylib.el-20091113204419-o5vbwnq5f7feedwu-902

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-10-10 03:24:41 +0000
+++ b/etc/NEWS  2014-10-11 02:54:11 +0000
@@ -169,6 +169,8 @@
 
 **** Variables `european-calendar-style', `diary-face', 
`hebrew-holidays-{1,4}'.
 
+**** The nil and list forms of `diary-display-function'.
+
 ** New ERT function `ert-summarize-tests-batch-and-exit'.
 
 ---

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-10 12:39:49 +0000
+++ b/lisp/ChangeLog    2014-10-11 02:54:11 +0000
@@ -1,3 +1,10 @@
+2014-10-11  Glenn Morris  <address@hidden>
+
+       * calendar/diary-lib.el (diary-display-function):
+       Drop support for deprecated nil and list forms.
+       (diary-list-entries): Update for the above.
+       * calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly.
+
 2014-10-10  Leo Liu  <address@hidden>
 
        * window.el (temp-buffer-window-show): Make BUFFER a required arg.

=== modified file 'lisp/calendar/cal-x.el'
--- a/lisp/calendar/cal-x.el    2014-10-08 18:30:45 +0000
+++ b/lisp/calendar/cal-x.el    2014-10-11 02:54:11 +0000
@@ -93,9 +93,7 @@
   "Display and dedicate the window associated with the diary buffer."
   (set-window-dedicated-p
    (display-buffer
-    (if (if (listp diary-display-function)
-            (memq 'diary-fancy-display diary-display-function)
-          (eq diary-display-function 'diary-fancy-display))
+    (if (eq diary-display-function 'diary-fancy-display)
         (progn
           ;; If there are no diary entries, there won't be a buffer
           ;; to dedicate, so make a basic one.

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2014-10-06 02:02:04 +0000
+++ b/lisp/calendar/diary-lib.el        2014-10-11 02:54:11 +0000
@@ -159,11 +159,6 @@
   "Function used to display the diary.
 The two standard options are `diary-fancy-display' and `diary-simple-display'.
 
-For historical reasons, `nil' is the same as `diary-simple-display'
-\(so you must use `ignore' for no display).  Also for historical
-reasons, this variable can be a list of functions to run.  These
-uses are not recommended and may be removed at some point.
-
 When this function is called, the variable `diary-entries-list'
 is a list, in order by date, of all relevant diary entries in the
 form of ((MONTH DAY YEAR) STRING), where string is the diary
@@ -172,9 +167,8 @@
 holidays), or hard copy output."
   :type '(choice (const diary-fancy-display :tag "Fancy display")
                  (const diary-simple-display :tag "Basic display")
-                 (const ignore :tag "No display")
-                 (const nil :tag "Obsolete way to choose basic display")
-                 (hook :tag "Obsolete form with list of display functions"))
+                 (const :tag "No display" ignore)
+                 (function :tag "User-specified function"))
   :initialize 'custom-initialize-default
   :set 'diary-set-maybe-redraw
   :version "23.2"                       ; simple->fancy
@@ -867,12 +861,7 @@
                                   'display-buffer-in-previous-window
                                   (copy-sequence
                                    (car display-buffer-fallback-action))))))
-                      (if (and diary-display-function
-                               (listp diary-display-function))
-                          ;; Backwards compatibility.
-                          (run-hooks 'diary-display-function)
-                        (funcall (or diary-display-function
-                                     'diary-simple-display)))))
+                      (funcall diary-display-function)))
                   (run-hooks 'diary-hook)))))
         (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff)))
       (or d-incp (message "Preparing diary...done"))