GitLab

* lisp/progmodes/sh-script.el (sh-font-lock-keywords-var):
Make bash entry derive from sh entry, not shell entry.

file name.

* net/tramp-cache.el (tramp-flush-file-property): Flush also
properties of linked files.  (Bug#9879)

python-pdbtrack-stack-entry-regexp was not changed.
Mark an odd kind of change with no real attribution as tiny.
Remove conflict marker.

(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
Adjust to recognize ipdb as well as regular python pdb prompts.
Adjustments shamelessly taken exactly as suggested in EmacsWiki
page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14

* allout-widgets.el: (file metadata): Attribute copyright to FSF
and collapse date sequence, obscure author/maintainer email
address better, remove extra version line, track relocation of
author's allout webpage.

* allout.el: (file metadata): Attribute copyright to FSF
and collapse date sequence, obscure author/maintainer email
address better, track relocation of author's allout webpage.

(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
Adjust to recognize ipdb as well as regular python pdb prompts.
Adjustments shamelessly taken exactly as suggested in EmacsWiki
page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14

* window.h (window): Rename slot "nest" to "combination_limit".
* window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
(Fset_window_nest): Rename to Fset_window_combination_limit.
(Vwindow_nest): Rename to Vwindow_combination_limit.
(recombine_windows, make_parent_window, make_window)
(Fsplit_window_internal, saved_window)
(Fset_window_configuration, save_window_save): Rename all
occurrences of window_nest to window_combination_limit.
* window.el (split-window, window-state-get-1)
(window-state-put-1, window-state-put-2): Rename occurrences of
window-nest to window-combination-limit.
* cus-start.el (window-nest): Rename to
window-combination-limit.
* windows.texi (Resizing Windows, Splitting Windows): Rename
occurrences of window-nest to window-combination-limit.

Fixes: debbugs:10033

`completing-read' will remove *Completions* and will preserve
current-buffer for us.
(tmm-add-prompt): Users of *Completions* will always (re)set its
major mode.
(tmm-old-comp-map): Remove.

Fixes: debbugs:10053

* lisp/mail/rmailedit.el: Require rmailmm when compiling.
(rmail-old-mime-state): New declaration.
(rmail-edit-current-message): If editing a mime message,
edit the "raw" message from the mbox buffer.
(rmail-cease-edit): Handle mime messages.

* lisp/mail/rmailmm.el (rmail-mime-toggle-raw): Remove entity arg,
which wasn't being used.  Add optional arg to force given state.
(rmail-mime): Add optional arg to force given state.

 admin/nt/README-ftp-server: Update the information about PNG libraries.
 nt/README.W32: Update the GTK Windows download URL for libpng.

I did not realize the comment was in Latin.

* lisp/mail/rmail.el (rmail-file-coding-system): It's only ever used
in a boolean sense, so just make it a boolean, and fix the doc.
(rmail-show-mime-function, rmail-mime-feature)
(rmail-require-mime-maybe): Doc fixes.
(rmail-show-message-1): Check rmail-show-mime-function is non-nil.

* lisp/mail/rmailmm.el (rmail-show-mime): Doc fix.

* lisp/mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment)
(rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode)
(rmail-mime-toggle-hidden, rmail-mime-insert-tagline)
(rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse)
(rmail-mime, rmail-show-mime): Doc fixes.

* lisp/term/ns-win.el (mode-line-frame-identification): Leave it alone.

* lisp/mail/rmailout.el (rmail-output-to-rmail-buffer):
Handle empty buffers.

 src/xdisp.c (display_line): Move the call to
 highlight_trailing_whitespace before the call to
 compute_line_metrics, since the latter needs to see the final
 faces of all the glyphs to compute ROW's hash value.  Fixes
 assertion violations in row_equal_p.

src/w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
just return.

If the server hangs up while we're talking to it, just `message' the error instead of throwing an error.

* lisp/mail/rmailsum.el (rmail-summary): Remove movement to beginning
of message - not necessary, and causes problems.

I believe the call to rmail-summary-beginning-of-message was only
thought to be necessary due to a couple of bugs in rmail-new-summary
that are hopefully fixed now (`mesg' not being set,
rmail-summary-buffer's buffer locality not being considered).

Fixes: debbugs:9831

Nothing was setting the local variable `mesg'.
Eg when looking at message 10, pressing h to get a summary would
send you to message 1.

* lisp/progmodes/executable.el
(executable-make-buffer-file-executable-if-script-p):
Handle file-modes returning nil.

* lisp/mail/rmailsum.el (rmail-summary, rmail-new-summary)
(rmail-new-summary-1): Allow empty summaries. 
(rmail-new-summary): Remember that rmail-summary-buffer is buffer-local.

Fixes: debbugs:9964