GitLab

* simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY.

No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.

* emacs-lisp/debug.el (debug): Don't try using "previous"
window when its not live or on an invisible frame (Bug#17170).

Fixes: debbugs:20156

* src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+ 3 in alloca (tiny change)

 lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): Only call
 `recenter' if `current-buffer' is equal to `window-buffer'.

(cherry picked from commit 4a816020)

Fixes: debbugs:19285

* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.

(cherry picked from commit 8854b9cf)

Fixes: debbugs:17733

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false.  Highlight
`self' as a keyword.

(cherry picked from commit e991af92)

Fixes: debbugs:20026

* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.

(cherry picked from commit dad0fc58)

 doc/emacs/misc.texi (Term Mode):
 doc/emacs/programs.texi (Basic Indent, Custom C Indent):
 doc/emacs/mini.texi (Minibuffer History):
 doc/emacs/text.texi (Org Mode):
 doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly
 used.

* efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110).

 doc/emacs/basic.texi (Moving Point): Improve indexing for HOME and END.
 doc/emacs/cmdargs.texi (General Variables): Improve indexing for
 environment variables.
 doc/emacs/msdog.texi (Windows HOME):
 doc/emacs/msdog-xtra.texi (MS-DOS File Names): Remove markup from HOME in
 the index entries.

* src/frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is
nil/not present in the parameter alist.

Fixes: debbugs:19680

Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.

 nt/INSTALL: Add some more installation instructions for mingw-get
 users.

Originally reported as http://bugs.debian.org/765349.
Noticed when aspell has different data-dir and dict-dir.

* textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure
.dat files for aspell dicts are also searched for in location
described by `ispell-aspell-dict-dir', matching aspell's dict-dir
variable.

Extend `ispell-hunspell-dictionary-equivs-alist' use to aspell, once
renamed to a more general `ispell-dicts-name2locale-equivs-alist' name.

Originally reported as http://bugs.debian.org/745613

* textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist)
	(ispell-hunspell-fill-dictionary-entry)
	(ispell-find-hunspell-dictionaries)
	(ispell-set-spellchecker-params): New generic name for
	`ispell-hunspell-dictionary-equivs-alist'.
	(ispell-aspell-add-aliases): Also use
	`ispell-dicts-name2locale-equivs-alist' to get aspell aliases for
	standard dict names.

 src/search.c (find_newline): Avoid assertion violations in
 CHAR_TO_BYTE when a portion of the buffer was deleted and we look
 for newlines near the end of the buffer.  This happens in Rmail
 hen JIT font-lock fontifies a newly displayed portion of the
 buffer.

Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1080319

* lisp/net/browse-url.el (browse-url-firefox-startup-arguments):
Make obsolete.
(browse-url-firefox): Doc fix.  Remove -remote.
(browse-url-firefox-sentinel): Remove function.

* etc/NEWS: Mention this.

Fixes: debbugs:19921

 src/w32fns.c (Fw32__menu_bar_in_use): New internal function.

 lisp/frame.el (blink-cursor-timer-function): Don't increment
 blink-cursor-blinks-done counter when a menu is active on a w32
 frame.

Fixes: debbugs:19858

the prompt when comint-use-prompt-regexp is non-nil because it
doesn't distinguish input from output.  Check the field property
`output' for the case when comint-use-prompt-regexp is nil.

Fixes: debbugs:19710

Fixes: debbugs:19870

* net/tramp-sh.el (tramp-remote-process-environment): Disable paging
with PAGER=cat.

Do not merge this commit to trunk!

 src/menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
 mouse_position_for_popup only for X frames.