lp:~vcs-imports/emacs/trunk

Branch merges

2 branches proposed for merging into this one.

On hold for merging into lp:~portis25/emacs/snapshot

Mingming Ren: Approve on 2011-04-04

Propose for merging

Related source package recipes

4 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

118363. By Michal Nazarewicz <email address hidden> on 2014-11-17

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

118362. By Michal Nazarewicz <email address hidden> on 2014-11-17

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.

118361. By Michal Nazarewicz <email address hidden> on 2014-11-17

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.

118360. By Katsumi Yamaoka <email address hidden> on 2014-11-10

lisp/gnus/mml2015.el (mml2015-display-key-image): Adjust :version

118359. By Lars Magne Ingebrigtsen <email address hidden> on 2014-11-10

* net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.

118358. By Kenjiro NAKAYAMA on 2014-11-10

Allow uploading files from eww

2014-11-10 Kenjiro NAKAYAMA <email address hidden>

        * net/eww.el(eww-form-file(defface)): New defface of file upload form.
        (eww-submit-file): New key map of file upload.
        (eww-form-file): New file upload button and file name context.
        (eww-select-file): Select file and display selected file name.
        (eww-tag-input): Handle input tag of file type.
        (eww-update-field): Add point offset.
        (eww-submit): Add submit with multipart/form-data.

        * gnus/mm-url.el (mm-url-encode-multipart-form-data):
        Restore to handle "multipart/form-data" by eww.

118357. By Lars Magne Ingebrigtsen <email address hidden> on 2014-11-10

Allow using several eww buffers (bug#16211)

* net/eww.el (eww-render, eww-display-html, eww-setup-buffer):
Allow taking a buffer to render data in. This allows using several
eww buffers (bug#16211).

118356. By Charles Rendleman <email address hidden> on 2014-11-10

(eww-download-callback): Save only the file contents

* net/eww.el (eww-download-callback): Save only the file contents,
not the headers.

118355. By Lars Magne Ingebrigtsen <email address hidden> on 2014-11-10

(eww-save-history): Don't let the history grow infinitely.

118354. By Lars Magne Ingebrigtsen <email address hidden> on 2014-11-10

* eww.texi (Basics): Document `eww-readable'.