Commit 734b6791 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Merged from miles@gnu.org--gnu-2005 (patch 578-592)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-578
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-579
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-580
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-581
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-582
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-583
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-584
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-585
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-586
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-587
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-588
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-589
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-590
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-591
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-592
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-424
parents 0ff21b4e cc9e7d91
2005-10-08 Richard M. Stallman <rms@gnu.org>
* make-dist (tempparent): Don't check for 14-char file name limit.
2005-10-07 Romain Francoise <romain@orebokech.com>
* make-dist: Add etc/images/ezimage and etc/images/mail
directories. Install images in etc/images.
2005-10-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in: Prefer Carbon if --enable-carbon-app or
......
2005-10-11 Juanma Barranquero <lekktu@gmail.com>
* FOR-RELEASE (FATAL ERRORS): Remove item about JPEG
libraries on Windows (Done).
2005-10-01 Jason Rumney <jasonr@gnu.org>
* admin.el (set-version): Set version numbers in nt/emacs.rc.
......
......@@ -53,20 +53,8 @@ test), it may be better just to avoid displaying such images for emacs 22.
** Investigate reported crashes related to using an
invalid pointer from string_free_list.
** Emacs on Windows crashes reading JPEG images from files.
The problem is caused by the Emacs executable and the image library
having multiple, incompatible copies of the run-time code, which can
happen when mixing a MSVC build of Emacs with a MinGW build of the
jpeg library (or the other way around). The fix is straightforward
and has already been posted on the developers' list, but it is on the
back burner waiting for a legal comment or an alternate implementation
(around 30 lines of code).
* BUGS
* Pierre Albarede's Aug 30 bug report about C-v and long lines.
** Make a new interface for specifying window configurations
so that we can fix bugs in balance-windows.
......@@ -132,7 +120,7 @@ people who have checked it.
SECTION READERS
-----------------------------
man/abbrevs.texi Chong Yidong Joakim Verona
man/anti.texi
man/anti.texi Chong Yidong
man/basic.texi "Luc Teirlinck" Chong Yidong
man/buffers.texi "Luc Teirlinck" Chong Yidong
man/building.texi "Ted Zlatanov" <tzz@lifelogs.com>
......@@ -153,7 +141,7 @@ man/indent.texi "Luc Teirlinck" Chong Yidong
man/killing.texi "Luc Teirlinck" Chong Yidong
man/kmacro.texi "Luc Teirlinck" Chong Yidong
man/macos.texi
man/maintaining.texi
man/maintaining.texi Chong Yidong
man/major.texi "Luc Teirlinck" Chong Yidong
man/mark.texi "Luc Teirlinck" Chong Yidong
man/mini.texi "Luc Teirlinck" Chong Yidong
......@@ -184,7 +172,7 @@ SECTION READERS
----------------------------------
lispref/abbrevs.texi "Luc Teirlinck" Chong Yidong
lispref/advice.texi joakim@verona.se Chong Yidong
lispref/anti.texi
lispref/anti.texi Chong Yidong
lispref/backups.texi "Luc Teirlinck" Chong Yidong
lispref/buffers.texi "Luc Teirlinck" Chong Yidong
lispref/calendar.texi Joakim Verona <joakim@verona.se> Chong Yidong
......
2005-10-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* NEWS: -nb => -nbi
2005-10-10 Carsten Dominik <dominik@science.uva.nl>
* orgcard.tex: Version 3.17, no changes except version number.
2005-10-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* NEWS: -nb, --no-bitmap-icon
2005-10-02 Stefan Monnier <monnier@iro.umontreal.ca>
* TODO: Clarify the local variables entry.
......
......@@ -175,6 +175,11 @@ disables the splash screen; see also the variable
`inhibit-startup-message' (which is also aliased as
`inhibit-splash-screen').
 
+++
** The default is now to use an bitmap as the icon, so the command-line options
--icon-type, -i has been replaced with options --no-bitmap-icon, -nbi to turn
the bitmap icon off.
+++
** New user option `inhibit-startup-buffer-menu'.
When loading many files, for instance with `emacs *', Emacs normally
......@@ -2907,6 +2912,50 @@ from Outlook-format appointments in mail messages. The variable
`diary-outlook-formats' can be customized to recognize additional
formats.
 
+++
** Speedbar changes:
*** Speedbar items can now be selected by clicking mouse-1, based on
the `mouse-1-click-follows-link' mechanism.
*** SPC and DEL are no longer bound to scroll up/down in the speedbar
keymap.
*** The new command `speedbar-toggle-line-expansion', bound to SPC,
contracts or expands the line under the cursor.
*** New command `speedbar-create-directory', bound to `M'.
*** The new commands `speedbar-expand-line-descendants' and
`speedbar-contract-line-descendants', bound to `[' and `]'
respectively, expand and contract the line under cursor with all of
its descendents.
*** The new user option `speedbar-query-confirmation-method' controls
how querying is performed for file operations. A value of 'always
means to always query before file operations; 'none-but-delete means
to not query before any file operations, except before a file
deletion.
*** The new user option `speedbar-select-frame-method' specifies how
to select a frame for displaying a file opened with the speedbar. A
value of 'attached means to use the attached frame (the frame that
speedbar was started from.) A number such as 1 or -1 means to pass
that number to `other-frame'.
*** The new user option `speedbar-use-tool-tips-flag', if non-nil,
means to display tool-tips for speedbar items.
*** The frame management code in speedbar.el has been split into a new
`dframe' library. Emacs Lisp code that makes use of the speedbar
should use `dframe-attached-frame' instead of
`speedbar-attached-frame', `dframe-timer' instead of `speedbar-timer',
`dframe-close-frame' instead of `speedbar-close-frame', and
`dframe-activity-change-focus-flag' instead of
`speedbar-activity-change-focus-flag'. The variables
`speedbar-update-speed' and `speedbar-navigating-speed' are also
obsolete; use `dframe-update-speed' instead.
---
** sql changes.
 
......@@ -4353,7 +4402,7 @@ If non-nil, that says to preserve the window's current margin, fringe,
and scroll-bar settings.
 
+++
*** The new function `window-split-tree' returns a frame's window split tree.
*** The new function `window-tree' returns a frame's window tree.
 
+++
** Customizable fringe bitmaps
......
This diff is collapsed.
% Reference Card for Org Mode 3.16
% Reference Card for Org Mode 3.17
%
%**start of header
\newcount\columnsperpage
......@@ -58,7 +58,7 @@
% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for their many good ideas.
\def\orgversionnumber{3.16}
\def\orgversionnumber{3.17}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
......
This diff is collapsed.
This diff is collapsed.
......@@ -44,7 +44,8 @@ AUTOGENEL = loaddefs.el \
cus-load.el \
finder-inf.el \
subdirs.el \
eshell/esh-groups.el
eshell/esh-groups.el \
mh-e/mh-loaddefs.el
# Files to compile before others during a bootstrap. This is done to
# speed up the bootstrap process. The CC files are compiled first
......@@ -116,7 +117,7 @@ update-subdirs: doit
$(srcdir)/update-subdirs $$file; \
done;
updates: update-subdirs autoloads finder-data custom-deps
updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
# Update the AUTHORS file.
......@@ -148,7 +149,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
# subdirectories, to make sure require's and load's in the files being
# compiled find the right files.
compile: $(lisp)/subdirs.el doit
compile: $(lisp)/subdirs.el mh-autoloads doit
find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
wd=$(lisp); $(setwins); \
els=`echo $$wins | tr ' \011' '\012\012' | \
......@@ -201,7 +202,7 @@ compile-after-backup: backup-compiled-files compile-always
# Note that this doesn't create .elc files. It only recompiles if an
# .elc is present.
recompile: doit $(lisp)/progmodes/cc-mode.elc
recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc
$(EMACS) $(EMACSOPT) --eval "(batch-byte-recompile-directory 0)" $(lisp)
# CC Mode uses a compile time macro system which causes a compile time
......@@ -213,6 +214,44 @@ $(lisp)/progmodes/cc-mode.elc: \
$(lisp)/progmodes/cc-defs.el
$(EMACS) $(EMACSOPT) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el
# Update MH-E internal autoloads. These are not to be confused with
# the autoloads for the MH-E entry points, which are already in
# loaddefs.el.
MH-E-SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \
$(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el \
$(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el \
$(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el \
$(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el \
$(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el \
$(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el \
$(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el \
$(lisp)/mh-e/mh-utils.el
mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
$(lisp)/mh-e/mh-loaddefs.el: $(MH-E-SRC)
echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
echo ";;" >> $@
echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
echo ";;; Author: Bill Wohler <wohler@newt.com>" >> $@
echo ";;; Keywords: mail" >> $@
echo ";;; Commentary:" >> $@
echo ";;; Change Log:" >> $@
echo ";;; Code:" >> $@
$(EMACS) $(EMACSOPT) \
-l autoload \
--eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
--eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
--eval "(setq make-backup-files nil)" \
-f batch-update-autoloads $(lisp)/mh-e
echo " " >> $@
echo "(provide 'mh-loaddefs)" >> $@
echo ";;; Local Variables:" >> $@
echo ";;; version-control: never" >> $@
echo ";;; no-byte-compile: t" >> $@
echo ";;; no-update-autoloads: t" >> $@
echo ";;; End:" >> $@
echo ";;; mh-loaddefs.el ends here" >> $@
# Prepare a bootstrap in the lisp subdirectory.
#
# Build loaddefs.el to make sure it's up-to-date. If it's not, that
......@@ -241,7 +280,7 @@ bootstrap-clean:
# Generate/update files for the bootstrap process.
bootstrap: update-subdirs autoloads compile
bootstrap: update-subdirs autoloads mh-autoloads compile
# Generate/update files after the bootstrap process.
# custom-deps needs `preloaded-file-list'.
......
......@@ -239,6 +239,7 @@
(real number)
(number)
(scalar)
(sqmatrix matrix vector)
(matrix vector)
(vector)
(const)))
......@@ -305,6 +306,10 @@
(and (not (Math-scalarp a))
(not (math-known-scalarp a t))))
(defun math-known-square-matrixp (a)
(and (math-known-matrixp a)
(math-check-known-square-matrixp a)))
;;; Try to prove that A is a scalar (i.e., a non-vector).
(defun math-check-known-scalarp (a)
(cond ((Math-objectp a) t)
......@@ -323,8 +328,17 @@
(let ((decl (if (eq (car a) 'var)
(or (assq (nth 2 a) math-decls-cache)
math-decls-all)
(assq (car a) math-decls-cache))))
(memq 'scalar (nth 1 decl))))))
(assq (car a) math-decls-cache)))
val)
(cond
((memq 'scalar (nth 1 decl))
t)
((and (eq (car a) 'var)
(boundp (nth 2 a))
(setq val (symbol-value (nth 2 a))))
(math-check-known-scalarp val))
(t
nil))))))
;;; Try to prove that A is *not* a scalar.
(defun math-check-known-matrixp (a)
......@@ -342,9 +356,46 @@
(let ((decl (if (eq (car a) 'var)
(or (assq (nth 2 a) math-decls-cache)
math-decls-all)
(assq (car a) math-decls-cache))))
(memq 'vector (nth 1 decl))))))
(assq (car a) math-decls-cache)))
val)
(cond
((memq 'matrix (nth 1 decl))
t)
((and (eq (car a) 'var)
(boundp (nth 2 a))
(setq val (symbol-value (nth 2 a))))
(math-check-known-matrixp val))
(t
nil))))))
;;; Given that A is a matrix, try to prove that it is a square matrix.
(defun math-check-known-square-matrixp (a)
(cond ((math-square-matrixp a)
t)
((eq (car-safe a) '^)
(math-check-known-square-matrixp (nth 1 a)))
(t
(let ((decl (if (eq (car a) 'var)
(or (assq (nth 2 a) math-decls-cache)
math-decls-all)
(assq (car a) math-decls-cache)))
val)
(cond
((memq 'sqmatrix (nth 1 decl))
t)
((and (eq (car a) 'var)
(boundp (nth 2 a))
(setq val (symbol-value (nth 2 a))))
(math-check-known-square-matrixp val))
((and (or
(integerp calc-matrix-mode)
(eq calc-matrix-mode 'sqmatrix))
(eq (car-safe a) 'var))
t)
((memq 'matrix (nth 1 decl))
nil)
(t
nil))))))
;;; Try to prove that A is a real (i.e., not complex).
(defun math-known-realp (a)
......@@ -1869,6 +1920,21 @@
(cond ((and math-simplify-only
(not (equal a math-simplify-only)))
(list '^ a b))
((and (eq (car-safe a) '*)
(or
(and
(math-known-matrixp (nth 1 a))
(math-known-matrixp (nth 2 a)))
(and
calc-matrix-mode
(not (eq calc-matrix-mode 'scalar))
(and (not (math-known-scalarp (nth 1 a)))
(not (math-known-scalarp (nth 2 a)))))))
(if (and (= b -1)
(math-known-square-matrixp (nth 1 a))
(math-known-square-matrixp (nth 2 a)))
(list '* (list '^ (nth 2 a) -1) (list '^ (nth 1 a) -1))
(list '^ a b)))
((and (eq (car-safe a) '*)
(or (math-known-num-integerp b)
(math-known-nonnegp (nth 1 a))
......
......@@ -296,7 +296,7 @@
(set-window-buffer old-win (calc-trail-buffer))
(set-window-buffer win calc-keypad-buffer)
(set-window-start win 1)
(setq win (split-window win (+ width 3) t))
(setq win (split-window win (+ width 7) t))
(set-window-buffer win calcbuf))
(if (or t ; left-side keypad not yet fully implemented
(< (save-excursion
......@@ -384,7 +384,7 @@
(delete-region (point-min) (point))
(if calc-keypad-input
(insert "Calc: " calc-keypad-input "\n")
(insert "----+-----Calc " calc-version "-----+----"
(insert "----+-----Calc " calc-version " -----+----"
(int-to-string (1+ calc-keypad-menu))
"\n")))))
(setq calc-keypad-prev-input calc-keypad-input))
......
......@@ -352,6 +352,7 @@
(if (eq calc-complex-mode 'polar) 1 0)
(cond ((eq calc-matrix-mode 'scalar) 0)
((eq calc-matrix-mode 'matrix) -2)
((eq calc-matrix-mode 'sqmatrix) -3)
(calc-matrix-mode)
(t -1))
(cond ((eq calc-simplify-mode 'none) -1)
......@@ -476,7 +477,9 @@
(cond ((eq arg 0) 'scalar)
((< (prefix-numeric-value arg) 1)
(and (< (prefix-numeric-value arg) -1) 'matrix))
(arg (prefix-numeric-value arg))
(arg
(if (consp arg) 'sqmatrix
(prefix-numeric-value arg)))
((eq calc-matrix-mode 'matrix) 'scalar)
((eq calc-matrix-mode 'scalar) nil)
(t 'matrix)))
......@@ -485,9 +488,11 @@
calc-matrix-mode calc-matrix-mode)
(message (if (eq calc-matrix-mode 'matrix)
"Variables are assumed to be matrices"
(if calc-matrix-mode
"Variables are assumed to be scalars (non-matrices)"
"Variables are not assumed to be matrix or scalar"))))))
(if (eq calc-matrix-mode 'sqmatrix)
"Variables are assumed to be square matrices"
(if calc-matrix-mode
"Variables are assumed to be scalars (non-matrices)"
"Variables are not assumed to be matrix or scalar")))))))
(defun calc-set-simplify-mode (mode arg msg)
(calc-change-mode 'calc-simplify-mode
......
......@@ -1069,25 +1069,18 @@
(math-add-or-sub (list '/ (nth 1 (nth 1 expr)) (nth 2 expr))
(list '/ (nth 2 (nth 1 expr)) (nth 2 expr))
nil (eq (car (nth 1 expr)) '-)))
((and (eq calc-matrix-mode 'matrix)
(eq (car-safe expr) '^)
(natnump (nth 2 expr))
(> (nth 2 expr) 1)
(memq (car-safe (nth 1 expr)) '(+ -)))
(if (= (nth 2 expr) 2)
(math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
(list '* (nth 2 (nth 1 expr)) (nth 1 expr))
nil (eq (car (nth 1 expr)) '-))
(math-add-or-sub (list '* (nth 1 (nth 1 expr)) (list '^ (nth 1 expr)
(1- (nth 2 expr))))
(list '* (nth 2 (nth 1 expr)) (list '^ (nth 1 expr)
(1- (nth 2 expr))))
nil (eq (car (nth 1 expr)) '-))))
((and (eq (car-safe expr) '^)
(memq (car-safe (nth 1 expr)) '(+ -))
(integerp (nth 2 expr))
(if (and (eq calc-matrix-mode 'matrix)
(> (nth 2 expr) 1))
(if (and
(or (math-known-matrixp (nth 1 (nth 1 expr)))
(math-known-matrixp (nth 2 (nth 1 expr)))
(and
calc-matrix-mode
(not (eq calc-matrix-mode 'scalar))
(not (and (math-known-scalarp (nth 1 (nth 1 expr)))
(math-known-scalarp (nth 2 (nth 1 expr)))))))
(> (nth 2 expr) 1))
(if (= (nth 2 expr) 2)
(math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
(list '* (nth 2 (nth 1 expr)) (nth 1 expr))
......
......@@ -654,6 +654,7 @@ If nil, computations on numbers always yield numbers where possible.")
(defcalcmodevar calc-matrix-mode nil
"If `matrix', variables are assumed to be matrix-valued.
If a number, variables are assumed to be NxN matrices.
If `sqmatrix', variables are assumed to be square matrices of an unspecified size.
If `scalar', variables are assumed to be scalar-valued.
If nil, symbolic math routines make no assumptions about variables.")
......@@ -1551,6 +1552,7 @@ See calc-keypad for details."
(cond ((eq calc-matrix-mode 'matrix) "Matrix ")
((integerp calc-matrix-mode)
(format "Matrix%d " calc-matrix-mode))
((eq calc-matrix-mode 'sqmatrix) "SqMatrix ")
((eq calc-matrix-mode 'scalar) "Scalar ")
(t ""))
(if (eq calc-complex-mode 'polar) "Polar " "")
......
......@@ -52,19 +52,21 @@
(setq expr (list func expr var)))
(calc-enter-result n "derv" expr))))
(defun calc-integral (var)
(interactive "sIntegration variable: ")
(calc-slow-wrapper
(if (or (equal var "") (equal var "$"))
(calc-enter-result 2 "intg" (list 'calcFunc-integ
(calc-top-n 2)
(calc-top-n 1)))
(let ((var (math-read-expr var)))
(if (eq (car-safe var) 'error)
(error "Bad format in expression: %s" (nth 1 var)))
(calc-enter-result 1 "intg" (list 'calcFunc-integ
(calc-top-n 1)
var))))))
(defun calc-integral (var &optional arg)
(interactive "sIntegration variable: \nP")
(if arg
(calc-tabular-command 'calcFunc-integ "Integration" "intg" nil var nil nil)
(calc-slow-wrapper
(if (or (equal var "") (equal var "$"))
(calc-enter-result 2 "intg" (list 'calcFunc-integ
(calc-top-n 2)
(calc-top-n 1)))
(let ((var (math-read-expr var)))
(if (eq (car-safe var) 'error)
(error "Bad format in expression: %s" (nth 1 var)))
(calc-enter-result 1 "intg" (list 'calcFunc-integ
(calc-top-n 1)
var)))))))
(defun calc-num-integral (&optional varname lowname highname)
(interactive "sIntegration variable: ")
......
;;; appt.el --- appointment notification functions
;; Copyright (C) 1989, 1990, 1994, 1998, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1989, 1990, 1994, 1998, 2004, 2005 Free Software Foundation, Inc.
;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; This file is part of GNU Emacs.
......@@ -337,13 +337,13 @@ displayed in a window:
diary-hook
(cons 'appt-make-list diary-hook))))
(diary))
(let ((diary-display-hook 'appt-make-list)
(d-buff (find-buffer-visiting
(substitute-in-file-name diary-file)))
selective)
(if d-buff ; diary buffer exists
(with-current-buffer d-buff
(setq selective selective-display)))
(let* ((diary-display-hook 'appt-make-list)
(d-buff (find-buffer-visiting
(substitute-in-file-name diary-file)))
(selective
(if d-buff ; Diary buffer exists.
(with-current-buffer d-buff
diary-selective-display))))
(diary)
;; If the diary buffer existed before this command,
;; restore its display state. Otherwise, kill it.
......
......@@ -3,7 +3,7 @@
;; Copyright (C) 1995, 1997, 2004 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: ISO calendar, calendar, diary
......
......@@ -4,7 +4,7 @@
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Lara Rios <lrios@coewl.cen.uiuc.edu>
;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: calendar, popup menus, menu bar
......@@ -352,7 +352,7 @@ Any holidays are shown if `holidays-in-diary-buffer' is t."
(diary-display-hook 'ignore)
(diary-entries
(mapcar (lambda (x) (split-string (car (cdr x)) "\^M\\|\n"))
(diary-list-entries date 1)))
(diary-list-entries date 1 'list-only)))
(holidays (if holidays-in-diary-buffer
(check-calendar-holidays date)))
(title (concat "Diary entries "
......
......@@ -3,7 +3,7 @@
;; Copyright (C) 1995, 2005 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: calendar
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment