intermediate commit
alarm export, first step
intermediate commit
New option `icalendar-export-alarms'.
Merge branch 'uj-icalendar-bug#5433'
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Fix bug#5433.
tildify.el: introduce a `tildify-space-string' variable

* textmodes/tildify.el (tildify-space-string): New variable for
specifying representation of a hard space -- a no-break space by
default.  Being a buffer-local variable it is much easier to
handle than `tildify-string-alist' that has been used so far.  It
also works better with derived modes.
(tildify-string-alist): Mark as obsolete.

* textmodes/tex-mode.el (tex-common-initialization): Set
`tildify-space-string' variable in all variants of TeX mode since
`tildify-string-alist' is now empty by default.

* nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.  If
encoding supports it use no-break space instead of character
entity; this changes previous default which used a numeric
reference.

* textmodes/sgml-mode.el (sgml-mode): ditto in `sgml-mode'.  If
encoding does not support no-break space, use numeric reference;
this changes previous default which used named entity (“&nbsp;”)
in HTML mode.
tildify.el: introduce a `tildify-pattern' variable

* textmodes/tildify.el (tildify-pattern): New variable for
defining tildifying pattern.  Being a buffer-local variable it is
much easier to handle than `tildify-pattern-alist' that has been
used so far.  It also works better with derived modes.
(tildify-pattern-alist): Mark as obsolete.
tildify.el: introduce a `tildify-foreach-region-function' variable

* textmodes/tildify.el (tildify-foreach-region-function): New
variable specifying a function determining portions of buffer that
should be tildified.  It allows major modes to create a filtering
function more elaborate than a set of regular expressions.
Initialised to `tildify--deprecated-ignore-evironments' by default
to handle now deprecated `tildify-ignored-environments-alist'
variable.
(tildify--foreach-region): A new function that takes
`tildify-foreach-region-function' into account and calls callback
for regions of the buffer that should be tildified.
(tildify-foreach-ignore-environments): A new function which can be
partially applied and used as `tildify-foreach-region-function'.
(tildify-ignored-environments-alist, tildify--pick-alist-entry):
Mark as obsolete.
(tildify--find-env): Rename from `tildify-find-env' and mark as
obsolete.
(tildify--deprecated-ignore-evironments): New function,
immediately marked as obsolete, used to handle deprecated
`tildify-ignored-environments-alist'.

* textmodes/tex-mode.el (tex-common-initialization): Set
`tildify-foreach-region-function' variable in all variants of TeX
mode since `tildify-ignored-environments-alist' variable is now
empty by default.

* nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.

* textmodes/sgml-mode.el (sgml-mode): Ditto in `sgml-mode'.
progmodes/cc-langs.el: Support some of the new keywords in C++11.

(c-operators): Add "alignof".
(c-primitive-type-kwds): Add "char16_t", "char32_t".
(c-type-modifier-kwds): Add "constexpr", "noexcept".
(c-modifier-kwds): Add "thread_local".
(c-constant-kwds): Add "nullptr".

Original patch by Paul Pogonyshev <pogonyshev@gmail.com> and updated
by Rüdiger Sonderfeld  <ruediger@c-plusplus.net>.
epg: Don't show "*Error*" buffer when visiting a new file

* epa-file.el (epa-file-insert-file-contents): Don't show
"*Error*" buffer if input file does not exist.
Reported by Herbert J. Skuhra.
epg: Simplify epa-pinentry-mode handling

* epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region): Remove redundant check of
epa-pinentry-mode.
* epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Remove redundant check of
epa-pinentry-mode.
epg: Fix callback argument type check

* epg.el (epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Check if the CALLBACK
argument is a function, instead of a cons.
Port new time stamp handling to Emacs 23.2.

This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
* calendar/time-date.el (time-add, time-subtract, time-less-p):
Use eval-and-compile, not eval-when-compile.
epg: Support key editing

* epg.el (epg-context): New slot EDIT-CALLBACK.
(epg--process-filter): Call EDIT-CALLBACK when editing a key.
(epg-reset): Reset EDIT-CALLBACK of the context.
(epg-start-edit-key): New function.
(epg-edit-key): New function.