Mercurial > emacs
view lisp/calendar/cal-x.el @ 26058:c11f0832a7c5
(Fconstrain_to_field): Make sure we don't violate the
argument preconditions of find_before_next_newline in the case
where both ONLY_IN_LINE and ESCAPE_FROM_EDGE are set and OLD_POS
was indeed at the edge.
(text_property_eq, text_property_stickiness): Don't
use initializers for auto variables of type Lisp_Object.
(find_field): Likewise. Use braces around nested ifs.
(Fline_end_position): Store the raw eol in a variable, so that the
final expression doesn't look so ugly.
(Fconstrain_to_field): Doc fix.
(preceding_pos): Renamed from `preceeding_pos'.
(text_property_stickiness, find_field): Call preceding_pos,
not preceeding_pos.
(Ffield_string_no_properties): New function.
(text_property_stickiness, preceeding_pos): New functions.
(Ffield_string): Remove PROPS parameter.
(find_field): Add MERGE_AT_BOUNDARY parameter.
Rewrite to use stickiness of `field' property to resolve
ambiguous cases.
(Ffield_beginning, Ffield_end): Add ESCAPE_FROM_EDGE parameter.
(Fconstrain_to_field): Likewise.
(syms_of_editfns): Init Sfield_string_no_properties.
(Ffield_string, Ferase_field, Ffield_end):
Supply new MERGE_AT_BOUNDARY argument to find_field.
(Fline_beginning_position, Fline_end_position): Supply new
ESCAPE_FROM_EDGE parameter to Fconstrain_to_field.
Pass a value of Qt for the ONLY_IN_LINE argument to
Fconstrain_to_field (only matters if N != 1).
(Fconstrain_to_field): Add get/set-current-point
behavior when NEW_POS is nil.
(find_field): Use XSETFASTINT instead of make_number.
(Qfield): New variable.
(find_field, Ferase_field, Ffield_string,
Ffield_beginning, Ffield_end, Fconstrain_to_field): New functions.
(Fline_beginning_position, Fline_end_position): Constrain to any field.
(make_buffer_string_both): Remove minibuffer-prompt hack.
(syms_of_editfns): Initialize Qfield, and subr entries for
field functions above.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Sun, 17 Oct 1999 12:55:00 +0000 |
parents | 5f37b93c8538 |
children | bd1a8b1c88d7 |
line wrap: on
line source
;;; cal-x.el --- calendar windows in dedicated frames in X ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.sunysb.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> ;; Keywords: calendar ;; Human-Keywords: calendar, dedicated frames, X Window System ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; This collection of functions implements dedicated frames in X for ;; calendar.el. ;; Comments, corrections, and improvements should be sent to ;; Edward M. Reingold Department of Computer Science ;; (217) 333-6733 University of Illinois at Urbana-Champaign ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue ;; Urbana, Illinois 61801 ;;; Code: (require 'calendar) (defvar calendar-frame nil "Frame in which to display the calendar.") (defvar diary-frame nil "Frame in which to display the diary.") ;; This should not specify the font. That's up to the user. ;; Certainly it should not specify auto-lower and auto-raise ;; since most users won't like that. (defvar 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. Location and color should be set in .Xdefaults.") (defvar calendar-frame-parameters '((name . "Calendar") (title . "Calendar") (minibuffer . nil) (height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . nil)) "Parameters of the calendar frame, if the calendar is in a separate frame. Location and color should be set in .Xdefaults.") (defvar 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. Location and color should be set in .Xdefaults.") (defvar calendar-after-frame-setup-hooks nil "Hooks to be run just after setting up a calendar frame. Can be used to change frame parameters, such as font, color, location, etc.") (defun calendar-one-frame-setup (&optional arg) "Start calendar and display it in a dedicated frame together with the diary." (if (not window-system) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) (let ((special-display-buffer-names nil) (view-diary-entries-initially t)) (save-window-excursion (save-excursion (setq calendar-frame (make-frame calendar-and-diary-frame-parameters)) (run-hooks 'calendar-after-frame-setup-hooks) (select-frame calendar-frame) (if (eq 'icon (cdr (assoc 'visibility (frame-parameters calendar-frame)))) (iconify-or-deiconify-frame)) (calendar-basic-setup arg) (set-window-dedicated-p (selected-window) 'calendar) (set-window-dedicated-p (display-buffer (if (not (memq 'fancy-diary-display diary-display-hook)) (get-file-buffer diary-file) (if (not (bufferp (get-buffer fancy-diary-buffer))) (make-fancy-diary-buffer)) fancy-diary-buffer)) 'diary)))))) (defun calendar-only-one-frame-setup (&optional arg) "Start calendar and display it in a dedicated frame." (if (not window-system) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (let ((special-display-buffer-names nil) (view-diary-entries-initially nil)) (save-window-excursion (save-excursion (setq calendar-frame (make-frame calendar-frame-parameters)) (run-hooks 'calendar-after-frame-setup-hooks) (select-frame calendar-frame) (if (eq 'icon (cdr (assoc 'visibility (frame-parameters calendar-frame)))) (iconify-or-deiconify-frame)) (calendar-basic-setup arg) (set-window-dedicated-p (selected-window) 'calendar)))))) (defun calendar-two-frame-setup (&optional arg) "Start calendar and diary in separate, dedicated frames." (if (not window-system) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) (let ((pop-up-windows nil) (view-diary-entries-initially nil) (special-display-buffer-names nil)) (save-window-excursion (save-excursion (calendar-basic-setup arg)) (setq calendar-frame (make-frame calendar-frame-parameters)) (run-hooks 'calendar-after-frame-setup-hooks) (select-frame calendar-frame) (if (eq 'icon (cdr (assoc 'visibility (frame-parameters calendar-frame)))) (iconify-or-deiconify-frame)) (display-buffer calendar-buffer) (set-window-dedicated-p (selected-window) 'calendar) (setq diary-frame (make-frame diary-frame-parameters)) (run-hooks 'calendar-after-frame-setup-hooks) (select-frame diary-frame) (if (eq 'icon (cdr (assoc 'visibility (frame-parameters diary-frame)))) (iconify-or-deiconify-frame)) (save-excursion (diary)) (set-window-dedicated-p (display-buffer (if (not (memq 'fancy-diary-display diary-display-hook)) (get-file-buffer diary-file) (if (not (bufferp (get-buffer fancy-diary-buffer))) (make-fancy-diary-buffer)) fancy-diary-buffer)) 'diary))))) ;; Formerly (get-file-buffer diary-file) was added to the list here, ;; but that isn't clean, and the value could even be nil. (setq special-display-buffer-names (append special-display-buffer-names (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer fancy-diary-buffer other-calendars-buffer calendar-buffer))) (run-hooks 'cal-x-load-hook) (provide 'cal-x) ;;; cal-x.el ends here