GitLab

Run admin/update-copyright.

* calendar/diary-lib.el (calendar-mark-1): Fix thinko.

* lisp/calendar/diary-lib.el (diary-display-function):
Drop support for deprecated nil and list forms.
(diary-list-entries): Update for the above.

* lisp/calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly.

* lisp/calendar/cal-bahai.el (calendar-absolute-from-bahai)
(calendar-print-bahai-date, calendar-bahai-prompt-for-date)
(calendar-goto-bahai-date, list-bahai-diary-entries)
(mark-bahai-calendar-date-pattern, mark-bahai-diary-entries)
(insert-bahai-diary-entry, insert-monthly-bahai-diary-entry)
(insert-yearly-bahai-diary-entry):
* lisp/calendar/cal-china.el (chinese-calendar-time-zone)
(chinese-calendar-location-name)
(chinese-calendar-daylight-time-offset)
(chinese-calendar-standard-time-zone-name)
(chinese-calendar-daylight-time-zone-name)
(chinese-calendar-daylight-savings-starts)
(chinese-calendar-daylight-savings-ends)
(chinese-calendar-daylight-savings-starts-time)
(chinese-calendar-daylight-savings-ends-time)
(chinese-calendar-celestial-stem)
(chinese-calendar-terrestrial-branch)
(calendar-absolute-from-chinese, calendar-print-chinese-date)
(calendar-goto-chinese-date):
* lisp/calendar/cal-coptic.el (calendar-absolute-from-coptic)
(calendar-print-coptic-date, coptic-prompt-for-date)
(calendar-goto-coptic-date, calendar-absolute-from-ethiopic)
(calendar-print-ethiopic-date, calendar-goto-ethiopic-date):
* lisp/calendar/cal-french.el (calendar-absolute-from-french)
(calendar-print-french-date, calendar-goto-french-date):
* lisp/calendar/cal-hebrew.el (diary-sabbath-candles-minutes)
(calendar-absolute-from-hebrew, calendar-print-hebrew-date)
(hebrew-calendar-yahrzeit, calendar-goto-hebrew-date)
(holiday-rosh-hashanah-etc, holiday-hanukkah)
(holiday-passover-etc, holiday-tisha-b-av-etc)
(list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern)
(mark-hebrew-diary-entries, insert-hebrew-diary-entry)
(insert-monthly-hebrew-diary-entry)
(insert-yearly-hebrew-diary-entry, list-yahrzeit-dates)
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha)
(diary-sabbath-candles):
* lisp/calendar/cal-islam.el (calendar-absolute-from-islamic)
(calendar-print-islamic-date, calendar-goto-islamic-date)
(list-islamic-diary-entries, mark-islamic-calendar-date-pattern)
(mark-islamic-diary-entries, insert-islamic-diary-entry)
(insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry):
* lisp/calendar/cal-iso.el (calendar-absolute-from-iso)
(calendar-print-iso-date, calendar-iso-read-args)
(calendar-goto-iso-date, calendar-goto-iso-week):
* lisp/calendar/cal-julian.el (calendar-absolute-from-julian)
(calendar-print-julian-date, calendar-goto-julian-date)
(calendar-absolute-from-astro, calendar-print-astro-day-number)
(calendar-goto-astro-day-number):
* lisp/calendar/cal-mayan.el (calendar-print-mayan-date)
(calendar-next-haab-date, calendar-previous-haab-date)
(calendar-next-tzolkin-date, calendar-previous-tzolkin-date)
(calendar-next-calendar-round-date)
(calendar-previous-calendar-round-date)
(calendar-absolute-from-mayan-long-count)
(calendar-goto-mayan-long-count-date):
* lisp/calendar/cal-move.el (scroll-calendar-left)
(scroll-calendar-right, scroll-calendar-left-three-months)
(scroll-calendar-right-three-months):
* lisp/calendar/cal-persia.el (calendar-absolute-from-persian)
(calendar-print-persian-date, persian-prompt-for-date)
(calendar-goto-persian-date):
* lisp/calendar/cal-x.el (calendar-after-frame-setup-hooks):
* lisp/calendar/calendar.el (view-diary-entries-initially)
(mark-diary-entries-in-calendar, calendar-today-face)
(diary-face, holiday-face, view-calendar-holidays-initially)
(mark-holidays-in-calendar, initial-calendar-window-hook)
(today-visible-calendar-hook, today-invisible-calendar-hook)
(hebrew-diary-entry-symbol, islamic-diary-entry-symbol)
(bahai-diary-entry-symbol, american-date-diary-pattern)
(european-date-diary-pattern, european-calendar-display-form)
(american-calendar-display-form, holidays-in-diary-buffer)
(all-hebrew-calendar-holidays, all-christian-calendar-holidays)
(all-islamic-calendar-holidays, all-bahai-calendar-holidays)
(fancy-diary-buffer, increment-calendar-month)
(extract-calendar-month, extract-calendar-day)
(extract-calendar-year, exit-calendar, calendar-date-is-legal-p)
(mark-visible-calendar-date, calendar-version):
* lisp/calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol)
(diary-display-hook, list-diary-entries-hook)
(mark-diary-entries-hook, nongregorian-diary-listing-hook)
(nongregorian-diary-marking-hook, print-diary-entries-hook)
(abbreviated-calendar-year, number-of-diary-entries)
(view-other-diary-entries, add-to-diary-list)
(include-other-diary-files, simple-diary-display)
(fancy-diary-display, print-diary-entries, mark-diary-entries)
(mark-sexp-diary-entries, mark-included-diary-files)
(mark-calendar-days-named, mark-calendar-month)
(mark-calendar-date-pattern, sort-diary-entries)
(list-sexp-diary-entries, make-diary-entry, insert-diary-entry)
(insert-weekly-diary-entry, insert-monthly-diary-entry)
(insert-yearly-diary-entry, insert-anniversary-diary-entry)
(insert-block-diary-entry, insert-cyclic-diary-entry)
(fancy-diary-font-lock-keywords, fancy-diary-display-mode):
* lisp/calendar/holidays.el (general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays)
(christian-holidays, islamic-holidays, bahai-holidays)
(solar-holidays, list-calendar-holidays)
(check-calendar-holidays, mark-calendar-holidays)
(filter-visible-calendar-holidays):
* lisp/calendar/lunar.el (calendar-phases-of-moon, phases-of-moon)
(diary-phases-of-moon): Remove obsolete aliases.

* lisp/calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook.
* calendar/cal-x.el (calendar-one-frame-setup)
(calendar-only-one-frame-setup, calendar-two-frame-setup):
Remove obsolete functions.
(cal-x-load-hook): Remove obsolete hook.

* calendar/calendar.el (european-calendar-style): Remove obsolete variable.
(calendar-date-style): No longer consult european-calendar-style.

* calendar/calendar.el (european-calendar, american-calendar):
Remove obsolete commands.

* calendar/calendar.el (calendar-for-loop): Remove obsolete macro.

* calendar/diary-lib.el (diary-face): Remove obsolete variable.
(diary-font-lock-date-forms, diary-fancy-font-lock-keywords):
Use the face `diary' instead of the variable `diary-face'.

* calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2)
(hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables.

* lisp/calendar/icalendar.el (icalendar--date-style): Remove function.
Replace all uses with calendar-date-style.

* lisp/textmodes/remember.el (calendar-date-style): Declare.
(remember-diary-convert-entry):
No longer consult european-calendar-style.

* test/automated/icalendar-tests.el (icalendar--calendar-style):
Remove test, no longer relevant.

Fixes: debbugs:18381

 and fancy display.
* diary-lib.el (diary-live-p): Doc fix.

* lisp/calendar/diary-lib.el (calendar-chinese-month-name-array):
Defvar to pacify compiler.

* doc/emacs/cal-xtra.texi (Non-Gregorian Diary): Document new features for
Chinese calendar and diary.

* etc/NEWS: Mention support for Chinese dates in calendar and diary.

* lisp/calendar/cal-china.el (calendar-chinese-month-name-array): New var.
(calendar-chinese-from-absolute-for-diary)
(calendar-chinese-to-absolute-for-diary)
(calendar-chinese-mark-date-pattern, diary-chinese-mark-entries)
(diary-chinese-list-entries): New functions to list and mark
Chinese diary entries in the calendar window.
(diary-chinese-anniversary)
(diary-chinese-insert-anniversary-entry)
(diary-chinese-insert-entry, diary-chinese-insert-monthly-entry)
(diary-chinese-insert-yearly-entry): New commands to insert
Chinese diary entries.

* lisp/calendar/cal-menu.el (cal-menu-diary-menu): Add entries for
inserting Chinese diary entries.

* lisp/calendar/calendar.el (diary-chinese-entry-symbol): New
customizable variable.
(calendar-mode-map): Add bindings for inserting Chinese diary
entries.

* lisp/calendar/diary-lib.el (diary-font-lock-keywords): Support
font-locking Chinese dates.

Fixes: debbugs:17393

Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.

(diary-entry): Use it in the action of this button type instead of
diary-goto-entry.

* todos.el (todos-diary-goto-entry): Add item locating code from
diary-goto-entry.  Add it at the top-level to override the latter
function.
(todos-powerset): Use definition by Wolfgang Jenkner, posted at
http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00423.html.

Fixes: debbugs:14349

(diary-from-outlook): Respect diary-from-outlook-function.

* doc/emacs/calendar.texi (Importing Diary):
Mention diary-from-outlook-function.

* etc/NEWS: Mention this.

* generic-x.el (rul-generic-mode): Use font-lock-constant-face.
* calendar/calendar.el (calendar-font-lock-keywords):
* calendar/diary-lib.el (diary-font-lock-keywords)
(diary-fancy-font-lock-keywords):
* textmodes/reftex-sel.el (reftex-insert-docstruct):
* textmodes/reftex-index.el (reftex-insert-index):
* textmodes/reftex-cite.el (reftex-format-bib-entry):
* progmodes/ruby-mode.el (ruby-font-lock-keywords):
* progmodes/ps-mode.el (ps-mode-font-lock-keywords-1):
* progmodes/prolog.el (prolog-font-lock-keywords):
* progmodes/idlwave.el (idlwave-idl-keywords):
* progmodes/ada-mode.el (ada-font-lock-keywords):
* net/snmp-mode.el (snmp-font-lock-keywords-3): Likewise.

* font-lock.el (font-lock-reference-face): Use
define-obsolete-variable-alias.

* bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes.
* comint.el (comint-prompt-read-only):
* custom.el (defcustom):
* hi-lock.el (hi-lock-mode):
* ibuffer.el (ibuffer-formats):
* ielm.el (ielm-prompt-read-only):
* novice.el (disable-command):
* saveplace.el (toggle-save-place):
* speedbar.el (speedbar-supported-extension-expressions):
* startup.el (auto-save-list-file-prefix, init-file-user)
(after-init-hook, inhibit-startup-echo-area-message):
* strokes.el (strokes-help):
* time-stamp.el (time-stamp):
* calendar/calendar.el (calendar, diary-file):
* calendar/diary-lib.el (diary-mail-entries, diary)
(diary-list-entries-hook):
* calendar/holidays.el (holidays, calendar-holidays):
* calendar/lunar.el (lunar-phases):
* calendar/solar.el (sunrise-sunset):
* emulation/edt.el (edt-load-keys):
* emulation/viper.el (viper-mode):
* eshell/em-alias.el (eshell-command-aliases-list):
* eshell/esh-util.el (eshell-convert-numeric-arguments):
* international/ogonek.el (ogonek-information):
* net/tramp-cmds.el (tramp-bug):
* net/quickurl.el (quickurl-reread-hook-postfix):
* play/decipher.el (decipher-font-lock-keywords):
* progmodes/cc-styles.el (c-set-style):
* progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* progmodes/inf-lisp.el (inferior-lisp-prompt):
* progmodes/octave-mod.el (octave-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password):
* progmodes/verilog-mode.el (verilog-read-defines):
* textmodes/two-column.el (2C-mode): Likewise.

* lisp/calendar/diary-lib.el (diary-include-files, diary-sexp-entry):
* lisp/calendar/holidays.el (calendar-holiday-list):
Report errors with display-warning rather than beep'n'sleep.

* 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.

* 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.

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.

* lisp/calendar/calendar.el (calendar-customized-p): New function.
(calendar-abbrev-construct, calendar-make-alist): Change what it does.
(calendar-day-name-array, calendar-month-name-array): Doc fix.
Add :set function.
(calendar-abbrev-length, calendar-day-abbrev-array)
(calendar-month-abbrev-array): Make defcustoms, with appropriate :set.
(calendar-day-abbrev-array, calendar-month-abbrev-array):
Elements may no longer be nil.
(calendar-day-name, calendar-month-name):
Update for changed nature of abbrev arrays.
* calendar/diary-lib.el (diary-name-pattern):
Update for changed nature of abbrev arrays.
(diary-mark-entries-1): Update calendar-make-alist calls.
(diary-font-lock-date-forms): Doc fix for changed abbrev arrays.
* calendar/cal-html.el (cal-html-day-abbrev-array):
Simply inherit from calendar-day-abbrev-array.

* etc/NEWS: Mention this.

* lisp/calendar/diary-lib.el (diary-list-entries-hook)
(diary-mark-entries-hook, diary-nongregorian-listing-hook)
(diary-nongregorian-marking-hook, diary-list-entries)
(diary-include-other-diary-files, diary-mark-entries)
(diary-mark-included-diary-files): Doc fixes.

* lisp/calendar/diary-lib.el (diary-comment-start, diary-comment-end):
New options.
(diary-add-to-list): Strip comments from the displayed string.
(diary-mode): Set comment-start and comment-end.

* doc/emacs/cal-xtra.texi (Fancy Diary Display): Mention diary comments.

* etc/NEWS: Mention this.

* lisp/calendar/diary-lib.el (diary-fancy-date-pattern):
Turn it into a function, so it follows changes in calendar-date-style.
(diary-fancy-date-matcher): New function.
(diary-fancy-font-lock-keywords): Use diary-fancy-date-matcher.
(diary-fancy-font-lock-fontify-region-function):
Use diary-fancy-date-pattern as a function.

* lisp/calendar/diary-lib.el (diary-fancy-date-pattern):
Do not use non-numbers for `year' etc pseudo-variables.

* lisp/calendar/appt.el (appt-make-list):
* lisp/calendar/cal-china.el (calendar-chinese-date-string):
* lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits)
(diary-hebrew-yahrzeit):
* lisp/calendar/cal-tex.el (cal-tex-last-blank-p, cal-tex-cursor-week2):
* lisp/calendar/calendar.el (calendar-generate-window):
* lisp/calendar/time-date.el (time-to-days):
Remove unused local variables.

* lisp/calendar/cal-dst.el (dst-adjust-time): Remove never-implemented
optional argument `style'.

* lisp/calendar/cal-tex.el (cal-tex-list-holidays, cal-tex-cursor-month)
(cal-tex-cursor-week, cal-tex-cursor-week2, cal-tex-cursor-week-iso)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily, cal-tex-mini-calendar)
* lisp/calendar/cal-html.el (cal-html-insert-minical):
* lisp/calendar/diary-lib.el (diary-list-entries-1, diary-list-entries)
(calendar-mark-date-pattern):
Prefix "unused" locals.

* lisp/calendar/diary-lib.el (diary-sexp-entry):
* lisp/calendar/holidays.el (holiday-sexp):
Set debug-on-error rather than the removed stack-trace-on-error.

* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.

bind "z" to `kill-this-buffer'.
(completion-list-mode-map): Bind "z" to `kill-this-buffer'.
* lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'.
(apropos-mode): Inherit from `special-mode'.
* lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'.
* lisp/bookmark.el (bookmark-bmenu-mode): Define using
`define-derived-mode' inheriting from `special-mode'.
* lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'.
* lisp/image-mode.el (image-mode-map): Ditto.
* lisp/replace.el (occur-mode): Define using
`define-derived-mode' inheriting from `special-mode'.
* lisp/tar-mode.el (tar-mode): Inherit from `special-mode'.
* lisp/calendar/diary-lib.el (diary-fancy-display-mode):
Inherit from `special-mode-map'.
* lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode):
Inherit from `special-mode'.
* lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from
`special-mode-map'.
(package-menu-mode): Define using `define-derived-mode'
inheriting from `special-mode'.
* erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'.
* lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'.
(xesam-mode-map): Define separately.
* lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'.
* lisp/progmodes/compile.el (compilation-minor-mode-map)
(compilation-mode-map): Inherit from `special-mode-map'.
* lisp/vc/diff-mode.el (diff-mode-shared-map):
Inherit from `special-mode-map'.
* lisp/vc/log-view.el (log-view-mode-map): Add a comment.

refreshing the diary buffer.

* lisp/calendar/diary-lib.el (diary-list-sexp-entries):
Handle case of no newline at end of file.