Update copyright year to 2015

[gnu-emacs] / lisp / calendar / cal-x.el

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 0f2d43b2237ec1acde64c1bf3e2aa58f473995cb..22daa46fb14be6f13ec607560aafca8f7766bd14 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -1,6 +1,6 @@
 ;;; cal-x.el --- calendar windows in dedicated frames
 
-;; Copyright (C) 1994-1995, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -65,9 +65,6 @@ Relevant if `calendar-setup' has the value `one-frame'."
              (vertical-scroll-bars boolean))
   :group 'calendar)
 
-(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
-  'calendar-after-frame-setup-hook "23.1")
-
 (defcustom calendar-after-frame-setup-hook nil
   "List of functions to be run after creating a calendar and/or diary frame."
   :type 'hook
@@ -96,13 +93,9 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
   "Display and dedicate the window associated with the diary buffer."
   (set-window-dedicated-p
    (display-buffer
-    (if (if (listp diary-display-function)
-            (or (memq 'diary-fancy-display diary-display-function)
-                (memq 'fancy-diary-display diary-display-function))
-          (memq diary-display-function '(diary-fancy-display
-                                         fancy-diary-display)))
+    (if (eq diary-display-function 'diary-fancy-display)
         (progn
-          ;; If there are no diary entries, there won't be a fancy-diary
+          ;; If there are no diary entries, there won't be a buffer
           ;; to dedicate, so make a basic one.
           (or (get-buffer diary-fancy-buffer)
               (calendar-in-read-only-buffer diary-fancy-buffer
@@ -150,42 +143,6 @@ If PROMPT is non-nil, prompt for the month and year to use."
         (if (eq config 'one-frame)
             (calendar-dedicate-diary))))))
 
-
-;;;###cal-autoload
-(defun calendar-one-frame-setup (&optional prompt)
-  "Display calendar and diary in a single dedicated frame.
-See `calendar-frame-setup' for more information."
-  (calendar-frame-setup 'one-frame prompt))
-
-(make-obsolete 'calendar-one-frame-setup 'calendar-frame-setup "23.1")
-
-
-;;;###cal-autoload
-(defun calendar-only-one-frame-setup (&optional prompt)
-  "Display calendar in a dedicated frame.
-See `calendar-frame-setup' for more information."
-  (calendar-frame-setup 'calendar-only prompt))
-
-(make-obsolete 'calendar-only-one-frame-setup 'calendar-frame-setup "23.1")
-
-
-;;;###cal-autoload
-(defun calendar-two-frame-setup (&optional prompt)
-  "Display calendar and diary in separate, dedicated frames.
-See `calendar-frame-setup' for more information."
-  (calendar-frame-setup 'two-frames prompt))
-
-(make-obsolete 'calendar-two-frame-setup 'calendar-frame-setup "23.1")
-
-
-;; Undocumented and probably useless.
-(defvar cal-x-load-hook nil
-  "Hook run on loading of the `cal-x' package.")
-(make-obsolete-variable 'cal-x-load-hook "it will be removed in future." "23.1")
-
-(run-hooks 'cal-x-load-hook)
-
-
 (provide 'cal-x)
 
 ;;; cal-x.el ends here