mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
59f7af816e
* lisp/allout.el (allout-passphrase-hint-string): Likewise. (allout-init): Use a declare form to mark obsolete. * lisp/calendar/calendar.el (calendar-version): * lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer) (icalendar-convert-diary-to-ical): * lisp/cus-edit.el (custom-mode): * lisp/ansi-color.el (ansi-color-unfontify-region): * lisp/international/latin1-disp.el (latin1-char-displayable-p): * lisp/progmodes/cwarn.el (turn-on-cwarn-mode): * lisp/progmodes/which-func.el (which-func-update-1): Use define-obsolete-function-alias. * lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark this function obsolete. * lisp/calendar/cal-x.el (calendar-two-frame-setup) (calendar-only-one-frame-setup, calendar-one-frame-setup): * lisp/calendar/calendar.el (american-calendar, european-calendar) (calendar-for-loop): * lisp/comint.el (comint-dynamic-simple-complete) (comint-dynamic-complete-as-filename, comint-unquote-filename): * lisp/desktop.el (desktop-load-default): * lisp/dired-x.el (dired-omit-here-always) (dired-hack-local-variables, dired-default-directory): * lisp/emacs-lisp/derived.el (derived-mode-class): * lisp/emacs-lisp/timer.el (timer-set-time-with-usecs): * lisp/emacs-lock.el (toggle-emacs-lock): * lisp/epa.el (epa-display-verify-result): * lisp/epg.el (epg-sign-keys, epg-start-sign-keys) (epg-passphrase-callback-function): * lisp/eshell/esh-util.el (eshell-for): * lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names) (eshell-add-to-window-buffer-names): * lisp/files.el (locate-file-completion): * lisp/imenu.el (imenu-example--create-c-index) (imenu-example--create-lisp-index) (imenu-example--lisp-extract-index-name) (imenu-example--name-and-position): * lisp/international/mule-cmds.el (princ-list): * lisp/international/mule-diag.el (decode-codepage-char): * lisp/international/mule-util.el (detect-coding-with-priority): * lisp/iswitchb.el (iswitchb-read-buffer): * lisp/mail/mailalias.el (mail-complete): * lisp/mail/sendmail.el (mail-sent-via): * lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar) (mouse-major-mode-menu): * lisp/password-cache.el (password-read-and-add): * lisp/pcomplete.el (pcomplete-parse-comint-arguments): * lisp/progmodes/sh-script.el (sh-maybe-here-document): * lisp/replace.el (query-replace-regexp-eval): * lisp/savehist.el (savehist-load): * lisp/simple.el (choose-completion-delete-max-match): * lisp/term.el (term-dynamic-simple-complete): * lisp/vc/ediff-init.el (ediff-check-version): * lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically): * lisp/vc/vc.el (vc-diff-switches-list): * lisp/view.el (view-return-to-alist-update): Likewise. * lisp/iswitchb.el (iswitchb-read-buffer): Move code of iswitchb-define-mode-map here, and delete that obsolete function. * lisp/subr.el (eval-next-after-load, makehash, insert-string) (assoc-ignore-representation, assoc-ignore-case): Use declare to mark obsolete. (mode-line-inverse-video): Variable deleted. * lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that this applies to functions. * lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias. * lisp/international/mule-util.el (string-to-sequence): Remove. * lisp/net/newst-backend.el (newsticker-cache-filename): * lisp/net/newst-treeview.el (newsticker-groups-filename): Fix incorrect obsolescence declaration. * lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete font-lock-reference-face. * lisp/url/url-parse.el (url-recreate-url-attributes): * lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark obsolete. * src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
186 lines
7.0 KiB
EmacsLisp
186 lines
7.0 KiB
EmacsLisp
;;; cal-x.el --- calendar windows in dedicated frames
|
|
|
|
;; Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc.
|
|
|
|
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
|
|
;; Edward M. Reingold <reingold@cs.uiuc.edu>
|
|
;; Maintainer: Glenn Morris <rgm@gnu.org>
|
|
;; Keywords: calendar
|
|
;; Human-Keywords: calendar, dedicated frames
|
|
;; Package: calendar
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; See calendar.el.
|
|
|
|
;;; Code:
|
|
|
|
(require 'calendar)
|
|
|
|
(defcustom diary-frame-parameters
|
|
'((name . "Diary") (title . "Diary") (height . 10) (width . 80)
|
|
(unsplittable . t) (minibuffer . nil))
|
|
"Parameters of the diary frame, if the diary is in its own frame.
|
|
Relevant if `calendar-setup' has the value `two-frames'."
|
|
:type 'alist
|
|
:options '((name string) (title string) (height integer) (width integer)
|
|
(unsplittable boolean) (minibuffer boolean)
|
|
(vertical-scroll-bars boolean))
|
|
:group 'calendar)
|
|
|
|
(defcustom calendar-frame-parameters
|
|
'((name . "Calendar") (title . "Calendar") (height . 10) (width . 80)
|
|
(unsplittable . t) (minibuffer . nil) (vertical-scroll-bars . nil))
|
|
"Parameters of the calendar frame, if the calendar is in a separate frame.
|
|
Relevant if `calendar-setup' has the value `calendar-only' or `two-frames'."
|
|
:type 'alist
|
|
:options '((name string) (title string) (height integer) (width integer)
|
|
(unsplittable boolean) (minibuffer boolean)
|
|
(vertical-scroll-bars boolean))
|
|
:group 'calendar)
|
|
|
|
(defcustom calendar-and-diary-frame-parameters
|
|
'((name . "Calendar") (title . "Calendar") (height . 28) (width . 80)
|
|
(minibuffer . nil))
|
|
"Parameters of the frame that displays both the calendar and the diary.
|
|
Relevant if `calendar-setup' has the value `one-frame'."
|
|
:type 'alist
|
|
:options '((name string) (title string) (height integer) (width integer)
|
|
(unsplittable boolean) (minibuffer boolean)
|
|
(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
|
|
:group 'calendar-hooks)
|
|
|
|
;;; End of user options.
|
|
|
|
(defvar calendar-frame nil
|
|
"Frame in which the calendar was last displayed.")
|
|
|
|
(defvar diary-frame nil
|
|
"Frame in which the diary was last displayed.")
|
|
|
|
(defun calendar-frame-1 (frame)
|
|
"Subroutine used by `calendar-frame-setup'.
|
|
Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
|
|
(run-hooks 'calendar-after-frame-setup-hook)
|
|
(select-frame frame)
|
|
(if (eq 'icon (cdr (assoc 'visibility (frame-parameters frame))))
|
|
(iconify-or-deiconify-frame)))
|
|
|
|
;; c-d-d is only called after (diary) has been run.
|
|
(defvar diary-display-function)
|
|
|
|
(defun calendar-dedicate-diary ()
|
|
"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)))
|
|
(progn
|
|
;; If there are no diary entries, there won't be a fancy-diary
|
|
;; to dedicate, so make a basic one.
|
|
(or (get-buffer diary-fancy-buffer)
|
|
(calendar-in-read-only-buffer diary-fancy-buffer
|
|
(calendar-set-mode-line "Diary Entries")))
|
|
diary-fancy-buffer)
|
|
(get-file-buffer diary-file)))
|
|
t))
|
|
|
|
;;;###cal-autoload
|
|
(defun calendar-frame-setup (config &optional prompt)
|
|
"Display the calendar, and optionally the diary, in a separate frame.
|
|
CONFIG should be one of:
|
|
`calendar-only' - just the calendar, no diary
|
|
`one-frame' - calendar and diary in a single frame
|
|
`two-frames' - calendar and diary each in a separate frame
|
|
|
|
If CONFIG has any other value, or if the display is not capable of
|
|
multiple frames, then `calendar-basic-setup' is called.
|
|
|
|
If PROMPT is non-nil, prompt for the month and year to use."
|
|
(if (not (and (display-multi-frame-p)
|
|
(memq config '(calendar-only one-frame two-frames))))
|
|
(calendar-basic-setup prompt)
|
|
(if (frame-live-p calendar-frame) (delete-frame calendar-frame))
|
|
(unless (eq config 'calendar-only)
|
|
(if (frame-live-p diary-frame) (delete-frame diary-frame)))
|
|
(let ((calendar-view-diary-initially-flag (eq config 'one-frame))
|
|
;; For calendar-dedicate-diary in two-frames case.
|
|
(pop-up-windows nil))
|
|
(save-window-excursion
|
|
;; Do diary first so that calendar is always left current.
|
|
(when (eq config 'two-frames)
|
|
(calendar-frame-1
|
|
(setq diary-frame (make-frame diary-frame-parameters)))
|
|
(diary)
|
|
(calendar-dedicate-diary))
|
|
(calendar-frame-1
|
|
(setq calendar-frame
|
|
(make-frame (if (eq config 'one-frame)
|
|
calendar-and-diary-frame-parameters
|
|
calendar-frame-parameters))))
|
|
(calendar-basic-setup prompt (not (eq config 'one-frame)))
|
|
(set-window-buffer (selected-window) calendar-buffer)
|
|
(set-window-dedicated-p (selected-window) t)
|
|
(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."
|
|
(declare (obsolete calendar-frame-setup "23.1"))
|
|
(calendar-frame-setup 'one-frame prompt))
|
|
|
|
;;;###cal-autoload
|
|
(defun calendar-only-one-frame-setup (&optional prompt)
|
|
"Display calendar in a dedicated frame.
|
|
See `calendar-frame-setup' for more information."
|
|
(declare (obsolete calendar-frame-setup "23.1"))
|
|
(calendar-frame-setup 'calendar-only prompt))
|
|
|
|
;;;###cal-autoload
|
|
(defun calendar-two-frame-setup (&optional prompt)
|
|
"Display calendar and diary in separate, dedicated frames.
|
|
See `calendar-frame-setup' for more information."
|
|
(declare (obsolete calendar-frame-setup "23.1"))
|
|
(calendar-frame-setup 'two-frames prompt))
|
|
|
|
;; 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
|