1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Commit Graph

1477 Commits

Author SHA1 Message Date
Glenn Morris
c8d3a25c09 Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com 2012-06-28 23:28:37 -07:00
Andreas Schwab
3d8b9024ad * calendar/cal-dst.el (calendar-current-time-zone): Return
calendar-current-time-zone-cache if non-nil.
2012-06-28 14:13:38 +02:00
Martin Rudalics
5cf983b29d In calendar-exit don't try to delete or iconify last frame.
* calendar/calendar.el (calendar-exit): Don't try to delete or
iconify last frame.  See:
http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html
2012-06-26 09:13:40 +02:00
Paul Eggert
d35af63cd6 Support higher-resolution time stamps.
Fixes: debbugs:9000
2012-06-22 14:17:42 -07:00
Glenn Morris
89b5595ade * calendar.el (calendar-in-read-only-buffer): Avoid some needless mode changes. 2012-06-21 21:50:35 -04:00
Ulf Jasper
ee5747918f icalendar / icalendar-tests: Fix Bug#11473 -- unescape commas in timezone specs
2012-06-08 Nick Dokos <nicholas.dokos@hp.com>

	* calendar/icalendar.el (icalendar--parse-vtimezone): Import TZID
	string properly, fixes Bug#11473.

2012-06-08  Ulf Jasper  <ulf.jasper@web.de>

	* automated/icalendar-tests.el (icalendar--parse-vtimezone): Test
	escaped commas in TZID (Bug#11473).
	(icalendar-import-with-timezone): New.
	(icalendar-real-world): Add new testcase as found in the bugreport
	of Bug#11473.
2012-06-08 19:34:09 +02:00
Glenn Morris
b7014632a6 Fix previous calendar-in-read-only-buffer change.
Otherwise all the mode-lines get clobbered.
2012-06-06 14:46:34 -04:00
Sam Steingold
628299e039 * lisp/calendar/calendar.el (calendar-in-read-only-buffer):
Call `special-mode' to enable the standard read-only keybindings.
2012-06-06 11:19:39 -04:00
Sam Steingold
48c455c701 * lisp/calendar/calendar.el (calendar-exit): reinstate the 2012-03-28 patch.
Fixes: debbugs:11140
2012-06-05 13:33:10 -04:00
Chong Yidong
3726946669 Remove incorrect uses of "modeline".
* ansi-color.el (ansi-color-faces-vector): Change default faces.

* cus-edit.el (mode-line):
* dframe.el (dframe-mouse-hscroll):
* emacs-lisp/re-builder.el:
* emacs-lisp/easy-mmode.el (define-minor-mode):
* frame.el (set-frame-name):
* help.el (lookup-minor-mode-from-indicator):
* net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name):
* progmodes/cc-cmds.el (c-toggle-auto-newline)
(c-toggle-hungry-state):
* progmodes/antlr-mode.el (antlr-language-alist):
* progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/which-func.el (which-func, which-func-cleanup-function):
* term/ns-win.el (ns-face-at-pos):
* term/sup-mouse.el (sup-mouse-report):
* textmodes/flyspell.el (flyspell-mode-line-string):
* textmodes/ispell.el (ispell-highlight-face):
* textmodes/reftex-global.el:
* vc/vc-arch.el (vc-arch-mode-line-string):
* vc/vc-cvs.el (vc-cvs-mode-line-string):
* vc/vc-git.el (vc-git-mode-line-string):
* vc/vc-hooks.el (vc-display-status)
(vc-default-mode-line-string):
* vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes.

* dired.el (dired-sort-set-mode-line): Rename from
dired-sort-set-modeline.  All callers changed.

* foldout.el (foldout-mode-line-string): Rename from
foldout-modeline-string.  All callers changed.
(foldout-update-mode-line): Rename from foldout-update-modeline.

* strokes.el (strokes-lighter): Rename from
strokes-modeline-string.

* subr.el (redraw-modeline): Make into obsolete alias.

* calendar/timeclock.el (timeclock-mode-line-display): Rename from
timeclock-modeline-display.  Make old name an alias.
(timeclock-update-mode-line): Likewise.  All callers changed.
(timeclock-mode-line-display): No need to check before using
add-hook.
(timeclock-relative, timeclock-day-over-hook)
(timeclock-use-elapsed, timeclock-mode-string)
(timeclock-mode-line-display): Doc fix, "modeline" -> "mode line".

* emulation/crisp.el (crisp-mode-mode-line-string): Rename from
crisp-mode-modeline-string.

* erc-track.el (erc-track, erc-track-faces-priority-list)
(erc-track-faces-normal-list, erc-track-find-face)
(erc-track-modified-channels): Fix modeline -> mode line in docs.

* eshell/esh-mode.el (eshell-status-in-mode-line): Rename from
eshell-status-in-modeline.

* org-clock.el (org-clock-string-limit)
(org-clock-modeline-total, org-clock-task-overrun-text)
(org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line".

* play/solitaire.el (solitaire-build-mode-line): Rename from
solitaire-build-modeline.  All callers changed.

* play/zone.el (zone-hiding-mode-line): Rename from
zone-hiding-modeline.  All callers changed.
(zone): Remove unusued `modeline-hidden-level' property.

* progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from
xscheme-modeline-initialize.  All callers changed.

* textmodes/sgml-mode.el (html-face-tag-alist)
(html-tag-face-alist): Use mode-line face instead of obsolete
alias modeline.

Fixes: debbugs:10329
2012-06-02 18:56:09 +08:00
Ulf Jasper
6dbaa1c769 icalendar-tests: Fix Bug#11525 -- Add icalendar-import-format-uid
2012-05-29  Ulf Jasper  <ulf.jasper@web.de>

	* calendar/icalendar.el
	(icalendar-export-region): Export UID properly.

2012-05-29 Leo Liu <sdl.web@gmail.com>
	* calendar/icalendar.el (icalendar-import-format): Add
	`icalendar-import-format-uid' (Bug#11525).
	(icalendar-import-format-uid): New.
	(icalendar--parse-summary-and-rest, icalendar--format-ical-event):
	Export UID.
2012-05-29 21:42:49 +02:00
Glenn Morris
48176e8bac Optionally include holidays in cal-html output
* lisp/calendar/cal-html.el: (cal-html-holidays): New option.
(cal-html-css-default): Add holiday entry.
(holiday-in-range): Autoload it.
(cal-html-htmlify-entry): Add optional class argument.
(cal-html-htmlify-list): Add optional holidays argument.
(cal-html-insert-agenda-days): Include holidays in the output.
(cal-html-one-month): Maybe include holidays.
2012-05-05 14:31:41 -07:00
Glenn Morris
a43f98b395 Move function from cal-tex to holidays
* calendar/holidays.el (holiday-in-range):
Move here from cal-tex-list-holidays.
* calendar/cal-tex.el (cal-tex-list-holidays):
Make it an obsolete alias for holiday-in-range.  Update all callers.
2012-05-05 13:58:14 -07:00
Stefan Monnier
71873e2b33 Add new error and function `user-error'.
* lisp/subr.el (user-error): New function.
* lisp/window.el (switch-to-buffer):
* lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve)
(smerge-match-conflict):
* lisp/simple.el (previous-matching-history-element)
(next-matching-history-element, goto-history-element, undo-more)
(undo-start):
* lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag)
(find-tag-noselect, find-tag-in-order, etags-goto-tag-location)
(next-file, tags-loop-scan, list-tags, complete-tag):
* lisp/progmodes/compile.el (compilation-loop):
* lisp/mouse.el (mouse-minibuffer-check):
* lisp/man.el (Man-bgproc-sentinel, Man-goto-page):
* lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back)
(Info-history-forward, Info-follow-reference, Info-menu)
(Info-extract-menu-item, Info-extract-menu-counting)
(Info-forward-node, Info-backward-node, Info-next-menu-item)
(Info-last-menu-item, Info-next-preorder, Info-last-preorder)
(Info-next-reference, Info-prev-reference, Info-index)
(Info-index-next, Info-follow-nearest-node)
(Info-copy-current-node-name):
* lisp/imenu.el (imenu--make-index-alist)
(imenu-default-create-index-function, imenu-add-to-menubar):
* lisp/files.el (basic-save-buffer, recover-file):
* lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments)
(checkdoc-message-text, checkdoc-defun):
* lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point):
* lisp/cus-edit.el (customize-changed-options, customize-rogue)
(customize-saved, custom-variable-set, custom-variable-mark-to-save)
(custom-variable-mark-to-reset-standard)
(custom-variable-reset-backup, custom-face-mark-to-reset-standard)
(custom-file):
* lisp/completion.el (check-completion-length):
* lisp/comint.el (comint-search-arg)
(comint-previous-matching-input-string-position)
(comint-previous-matching-input)
(comint-replace-by-expanded-history-before-point, comint-send-input)
(comint-copy-old-input, comint-backward-matching-input)
(comint-goto-process-mark, comint-set-process-mark):
* lisp/calendar/calendar.el (calendar-cursor-to-date): Use it.
* lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'.
* src/data.c (PUT_ERROR): New macro.
(syms_of_data): Use it.  Add new error type `user-error'.
* src/undo.c (user_error): New function.
(Fprimitive_undo): Use it.
* src/print.c (print_error_message): Adjust print style for `user-error'.
* src/keyboard.c (user_error): New function.
(Fexit_recursive_edit, Fabort_recursive_edit): Use it.
2012-05-04 19:16:47 -04:00
Glenn Morris
0e829eabcd * lisp/calendar/cal-tex.el (cal-tex-end-document): Trivial clarification. 2012-04-16 15:18:36 -04:00
Glenn Morris
0c2014a3c2 * lisp/calendar/holidays.el (calendar-check-holidays): Doc fix. 2012-04-09 00:11:39 -07:00
Glenn Morris
a1daddd610 Revert 2012-03-28 calendar change
* lisp/calendar/calendar.el (calendar-window-list)
(calendar-hide-window): Restore. 
(calendar-exit): Use calendar-window-list, calendar-hide-window again.

Fixes: debbugs:11140
2012-03-31 13:03:59 -07:00
Sam Steingold
6e7a6ec037 calendar/calendar.el (calendar-exit): Use `quit-windows-on' instead of
the broken adhockery which does not prevent calendar buffers from
being displayed at random after exit.
(calendar-window-list, calendar-hide-window): Remove the broken adhockery.
2012-03-29 10:00:00 -04:00
Glenn Morris
c7e73d5177 calendar-insert-at-column small fix for bug#10978
* lisp/calendar/calendar.el (calendar-insert-at-column):
Handle non-unit-width characters a bit better.
2012-03-15 21:10:46 -04:00
Glenn Morris
3809f91dfa Small calendar-string-spread fix for bug#10978
* lisp/calendar/calendar.el (calendar-string-spread):
Handle non-unit-width characters a bit better.
2012-03-13 13:56:31 -04:00
Tim Landscheidt
4aaa93566b Fix some missing trailing whitespace (tiny change)
* lisp/calendar/icalendar.el (icalendar-export-file, icalendar-import-file):
* lisp/emulation/ws-mode.el (ws-query-replace):
* lisp/sort.el (sort-regexp-fields):
Fix missing trailing whitespace in interactive prompts.

Fixes: debbugs:11002
2012-03-12 23:54:37 -07:00
Adam Spiers
2467932310 calendar-set-mode-line fix (tiny change)
* lisp/calendar/calendar.el (calendar-set-mode-line):
`getenv' returns a string.

Fixes: debbugs:10951
2012-03-05 21:18:29 -05:00
Glenn Morris
44e97401cd Standardize possessive apostrophe usage in manuals, docs, and comments
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
2012-02-28 00:17:21 -08:00
Andreas Schwab
f008086fd2 * calendar/parse-time.el (parse-time-string): Allow extractor to
return nil.
2012-02-25 11:00:08 +01:00
Glenn Morris
6818b4492e Use utf-8 Baha'i in calendar doc-strings, menus, etc
* lisp/calendar/cal-menu.el (cal-menu-diary-menu, cal-menu-goto-menu):
* lisp/calendar/calendar.el (diary-file, diary-bahai-entry-symbol)
(calendar-bahai-all-holidays-flag, calendar-other-dates):
* lisp/calendar/diary-lib.el (diary-abbreviated-year-flag):
* lisp/calendar/holidays.el (holiday-bahai-holidays)
(calendar-holidays, list-holidays):
Use utf-8 Baha'i in doc-strings, menus, etc.
2012-02-17 22:08:15 -05:00
Glenn Morris
d68cd08705 calendar-hebrew-list-yahrzeits tweak
* lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits):
Interactively in calendar buffer, give an error if not on a date.
2012-02-16 00:21:30 -08:00
Glenn Morris
536aea70db * lisp/calendar/calendar.el (calendar-mode): Locally set scroll-margin to 0. 2012-01-05 20:03:40 -05:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Paul Eggert
6196cffecf Spelling fixes. 2011-12-21 01:58:39 -08:00
Paul Eggert
fa46310344 Spelling fixes. 2011-12-05 00:55:25 -08:00
Glenn Morris
5158face2e appt.el trivia.
* lisp/calendar/appt.el (appt-add): Rewrite the interactive-spec to avoid
overly zealous deletion of trailing whitespace.
2011-12-04 11:41:44 -08:00
Glenn Morris
55dc42fcf3 * appt.el: Restore significant whitespace deleted by "spelling fix". 2011-12-04 11:31:41 -08:00
Paul Eggert
c80e3b4aed Spelling fixes. 2011-12-04 00:02:42 -08:00
Paul Eggert
e1dbe924b5 Spelling fixes. 2011-11-19 18:29:42 -08:00
Paul Eggert
c5e87d104b Spelling fixes. 2011-11-17 09:40:48 -08:00
Juanma Barranquero
7877f37394 Fix typos. 2011-11-16 18:47:25 +01:00
Paul Eggert
da6062e6ea Spelling fixes. 2011-11-14 23:55:13 -08:00
Paul Eggert
8350f087ef Spelling fixes. 2011-11-14 12:23:26 -08:00
Glenn Morris
a769dd157d Small cal-menu fix for bug#9976
* lisp/calendar/cal-menu.el (cal-menu-set-date-title):
Do nothing if not in a calendar.
2011-11-07 14:00:54 -05:00
Martin Rudalics
3d8daefefa Remove "iso-" infix from window combination functions.
* window.el (window-iso-combination-p, window-iso-combined-p)
(window-iso-combinations): Remove "iso-" infix.  Suggested by
Chong Yidong.
(window-min-size-1, window-size-fixed-1, window-min-delta-1)
(window-max-delta-1, window-resize, window--resize-siblings)
(window--resize-this-window, adjust-window-trailing-edge)
(split-window, balance-windows-1)
(shrink-window-if-larger-than-buffer):
* calendar/calendar.el (calendar-generate-window):
* help.el (resize-temp-buffer-window): Adjust callers
accordingly.
* windows.texi (Windows and Frames): Remove "iso-" infix from
documentation of window-iso-combined-p.
2011-10-30 09:29:56 +01:00
Chong Yidong
2d197ffbe2 Rename split-window-{above-each-other|split-window-side-by-side}
to split-window-below and split-window-right.

* lisp/window.el (split-window-below, split-window-right): Rename from
split-window-above-each-other and split-window-side-by-side
respectively.  All callers changed.
(split-window-sensibly, split-window-sensibly): Use them.
(split-window-keep-point): Doc fix.

* lisp/isearch.el: Add isearch-scroll property to split-window-below
and split-window-right.

* lisp/follow.el (follow-mode):
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
* lisp/progmodes/ada-xref.el (ada-gdb-application):
* lisp/emulation/vip.el (vip-buffer-in-two-windows):
* lisp/image-dired.el (image-dired-dired-with-window-configuration):
* lisp/dired-x.el (dired-do-find-marked-files):
* lisp/dired.el (dired-pop-to-buffer):
* lisp/bs.el (bs--show-with-configuration):
* lisp/vc/emerge.el (emerge-setup-windows):
* lisp/textmodes/two-column.el (2C-two-columns):
* lisp/textmodes/reftex-toc.el (reftex-toc):
* lisp/progmodes/gdb-mi.el (gdb-setup-windows):
* lisp/progmodes/fortran.el (fortran-window-create):
* lisp/net/newst-treeview.el (newsticker--treeview-window-init):
* lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode):
* lisp/emulation/tpu-edt.el (tpu-gold-map):
* lisp/emulation/crisp.el (crisp-mode-map):
* lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.
2011-10-30 09:56:03 +08:00
Glenn Morris
bdfa5dd206 * lisp/calendar/holidays.el (calendar-check-holidays): Doc fix. 2011-10-04 13:26:55 -04:00
Ulf Jasper
68575ab00b icalendar: Take care of multiple vcalendars in a single file.
lisp/ChangeLog:

	* calendar/icalendar.el (icalendar--all-events): Take care of
	multiple vcalendars in a single file.
	(icalendar--convert-float-to-ical): checkdoc fixes.

	* automated/icalendar-tests.el (icalendar-tests--compare-strings):
	Removed, simply use string=.
	(icalendar--diarytime-to-isotime)
	(icalendar--datetime-to-diary-date)
	(icalendar--datestring-to-isodate)
	(icalendar--format-ical-event)
	(icalendar--parse-summary-and-rest)
	(icalendar-tests--do-test-import)
	(icalendar-tests--do-test-cycle) : Changed argument order of
	string= to EXPECTED ACTUAL.
	(icalendar--import-format-sample)
	(icalendar--format-ical-event)
	(icalendar-import-non-recurring)
	(icalendar-import-rrule)
	(icalendar-import-duration)
	(icalendar-import-bug-6766)
	(icalendar-real-world): Adjusted to string= instead of
	icalendar-tests--compare-strings.
	(icalendar-import-multiple-vcalendars): New.
2011-07-26 17:36:04 +02:00
Paul Eggert
5777162a3e * calendar/timeclock.el (timeclock-seconds-to-time):
Defalias to seconds-to-time, since they're the same thing.
2011-06-30 17:20:59 -07:00
Glenn Morris
e9246b20af * lisp/calendar/diary-lib.el: Comment fix. 2011-06-25 15:33:29 -07:00
Glenn Morris
f6ba4cc9d8 Avoid some code duplication in diary-lib.el.
* lisp/calendar/diary-lib.el (diary-included-files): Doc fix.
(diary-include-files): New function, extracted from
diary-include-other-diary-files and diary-mark-included-diary-files.
(diary-include-other-diary-files, diary-mark-included-diary-files):
Just call diary-include-files.
(diary-mark-entries): Reset diary-included-files on first call.
2011-06-25 15:22:47 -07:00
Glenn Morris
1671230453 When marking, visit included diary-files in temp buffers.
Ref: bug#8920, but not a bug.

* lisp/calendar/diary-lib.el (diary-mark-entries)
(diary-mark-included-diary-files):
Visit included diary-files in temp buffers.
2011-06-25 15:10:21 -07:00
Martin Rudalics
39cffb4422 Restore window-safely-shrinkable-p but avoid using it in calendar.el.
* window.el (window-safely-shrinkable-p): Restore function which
was inadvertently removed in change from 2011-06-11.  Declare as
obsolete.

* calendar/calendar.el (calendar-generate-window): Use
window-iso-combined-p instead of combination of one-window-p and
window-safely-shrinkable-p.
2011-06-12 09:46:56 +02:00
Glenn Morris
0a2bb1a9cf Handle overlapping appointments in appt.el (bug#8377)
* lisp/calendar/appt.el (appt-disp-window-function): Doc fix.
(appt-check): Handle overlapping appointments.

* etc/NEWS: Mention appt-disp-window-function should handle lists now.
2011-06-11 10:54:53 -07:00
Glenn Morris
5b4d6e0e88 * lisp/calendar/appt.el (appt-mode-line): Eliminate one local variable. 2011-06-09 16:36:04 -04:00