GitLab

The following commit was skipped:

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

bb7b23c5 In `debug' don't try using window on inaccessible frame (Bug#17170).

Conflicts:
	lisp/ChangeLog

The following commit was skipped:

ae3d7333 Backport 20156 fix (stack corruption)

e72edc05 Fix lisp/ChangeLog entry from last commit.

Conflicts:
	lisp/ChangeLog

The following commits were skipped:

17ad6f83 Fix problems caused by calling 'recenter' in auto-revert  (Bug#20122)
1c4900d9 Backport: ruby-mode: Detect regexps after `!'
f74843a7 Backport: ruby-mode: Change faces used for self, true, false and nil
a5d1f94f Backport: ruby-mode: Expect regexp after { or | too

Fixes: debbugs:20154

* lisp/json.el (json-decode-char0): Delete this alias as well.
(json-read-escaped-char): Don't call it.

* process.c (Fmake_process): Refactor to avoid call to Flength, to
avoid cast to 'char **', and to reduce indenting and reuse of locals.

* lisp/emacs-lisp/lisp-mode.el
(lisp--el-non-funcall-position-p): New function.
(lisp--el-match-keyword): Use it.

* src/process.c (Fmake_process): New function.
(create_process, create_pty): Check p->pty_flag instead of
Vprocess_connection_type.
(syms_of_process): Register QCcommand, QCconnection_type, Qpty,
Qpipe, and Smake_process.  Unregister Sstart_process.

* lisp/subr.el (start-process): New function, ported from the C
implementation.

* doc/lispref/processes.texi (Asynchronous Processes): Mention
`make-process'.

* etc/NEWS: Mention `make-process'.

* lisp/window.el (window-adjust-process-window-size-function): New
customizable variable.
(window-adjust-process-window-size)
(window-adjust-process-window-size-smallest)
(window-adjust-process-window-size-largest)
(window--process-window-list, window--adjust-process-windows):
New functions.
(window-configuration-change-hook): Add
`window--adjust-process-windows'.
* lisp/term.el (term-mode): Observe result of
`window-adjust-process-window-size-function'.
(term-check-size): Delete.

Fixes: debbugs:20161

* textmodes/sgml-mode.el (sgml-attribute-offset): New defcustom.
(sgml-calculate-indent): Use `sgml-attribute-offset' for attribute
indentation.

* test/automated/json-tests.el: New file.

Fixes: debbugs:20154

* lisp/json.el (json-decode-char0): Delete this alias.
(json-encode-string): Rewrite to improve performance.
(json-encode-char): Fold into `json-encode-string'.

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)

* src/fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for
regexsize.

 src/emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and
 always use LC_ALL instead.  Fixes problems with setting
 system-time-locale to something non-default.

 lisp/window.el (window-font-width, window-font-height)
 (window-max-chars-per-line): New functions.
 lisp/simple.el (default-font-height): Doc fix.
 (default-font-width): New function.

 etc/NEWS: Mention `default-font-width', `window-font-height',
 `window-font-width', and `window-max-chars-per-line'.

 CONTRIBUTE (Test your changes.): New section.
 (Document your changes.): Add doc tips.

 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)

* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also
recognize (cl-)defmethod with (setf method) name.

* emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-1): Fix
false positive in function name font-locking.

* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix
false positive in function name font-locking.

Fixes: debbugs:20149

* lisp/emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive
occurrences of args via &cl-defs.

* font-lock.el (font-lock-extend-jit-lock-region-after-change):
Return the calculated values, as per spec.

Using eg add-change-log-entry-other-window, C-x 4 a, would avoid these issues

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit'
and `callcc' to the "methods with required arguments" section,
they need a block argument.  Remove a `throw' duplicate.

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)