GitLab

 src/xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
 the basic faces are supported.
 doc/lispref/modes.texi (Emulating Mode Line): Fix last change.
 etc/NEWS: Remove the entry about format-mode-line accepting only
 basic faces.

(isearch-lazy-highlight-new-loop): Compare `isearch-error' and
`isearch-lazy-highlight-error'.  Set `isearch-lazy-highlight-error'
to the current value of `isearch-error' (Bug#7468).

* doc/emacs/maintaining.texi: Move inclusion of emerge after EDE, so
that it matches its position in the menu.

 doc/lispref/modes.texi (Emulating Mode Line): Update documentation of
 format-mode-line according to changes that fixed bug #7587.

 etc/NEWS: Mention the incompatible change in format-mode-line wrt its
 FACE argument.

 xdisp.c (Fformat_mode_line): Fix last change.

* lisp/eshell/em-hist.el (eshell-previous-matching-input): Signal error
if point is not behind eshell-last-output-end (Bug#7585).

* textmodes/rst.el (rst-compile-pdf-preview)
(rst-compile-slides-preview): Use make-temp-file.

so that the later call to read-key-sequence works.

 fileio.c (Fexpand_file_name): One more doc fix.

 mail/smtpmail.el (smtpmail-send-it): Write queued mail body with Unix EOLs.

 the POSITION window's buffer.

 fileio.c (Fexpand_file_name): Doc fix.

 processes.texi (Shell Arguments):
 strings.texi (Creating Strings): Don't mention "shell commands";
 make it explicit that `split-string-and-unquote' and
 `combine-and-quote-strings' are mainly for working with arguments
 to call-process and start-process.

 w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.

 xdisp.c (string_pos_nchars_ahead, c_string_pos)
 (face_before_or_after_it_pos, next_element_from_string)
 (next_element_from_c_string, produce_stretch_glyph): Remove unused
 calculations of maximum string length before calling
 string_char_and_length and STRING_CHAR_AND_LENGTH.
 (string_char_and_length): Update commentary: MAXLEN is no longer
 needed.

 processes.texi (Shell Arguments): Fix documentation of
 `split-string-and-unquote'.  Add indexing.

 custom.texi (Init Syntax): Add index entries for "character syntax".

Fixes: debbugs:7607

* lisp/subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1)
(with-silent-modifications): Doc fixes.

* keyboard.c (kbd_buffer_get_event): Construct SAVE_SESSION_EVENT
as (Qsave_session arg).

* xsmfns.c (smc_interact_CB): Set arg to Qnil.
(smc_die_CB): Make an event with arg Qt.
(Fhandle_save_session): If event has Qt as argument,
call Fkill_emacs.

Regenerate configure and ldefs-boot.el.

Revert patch from 2010-12-08.  Use `save-restriction'.

Fixes: debbugs:7505

Do NOT merge with trunk!

 menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p): New functions.
 (menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>: Use
 them instead of `nil' and `>', respectively.

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

(convert-standard-filename means it was bogus.)

buffer-modified value.  (Bug#7557)
(tramp-action-password): Delete region, do not narrow.
(tramp-process-actions): Do not widen.