commit 08bad175d45dad7bb872c604cd2b8e84cc1cc5bb (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sun Jun 14 22:55:16 2015 -0700 Spelling fixes diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index acc3732..279382b 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -743,7 +743,7 @@ (#xFE10 . #xFE1F) ;; Vertical Forms (#x10100 . #x1013F) ;; Aegean Numbers (#x102E0 . #x102FF) ;; Coptic Epact Numbers - (#x1D000 . #x1D0FF) ;; Byzanthine Musical Symbols + (#x1D000 . #x1D0FF) ;; Byzantine Musical Symbols (#x1D200 . #x1D24F) ;; Ancient Greek Musical Notation (#x1F0A0 . #x1F0FF) ;; Playing Cards (#x1F100 . #x1F1FF) ;; Enclosed Alphanumeric Suppl diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 0cbfd80..df3aa59 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -34,8 +34,8 @@ along with GNU Emacs. If not, see . */ /* FTCR font driver. */ -/* The actual structure for ftcr font that can be casted to struct - font. */ +/* The actual structure for FTCR font. A pointer to this structure + can be cast to struct font *. */ struct ftcrfont_info { diff --git a/src/xdisp.c b/src/xdisp.c index f0e3090..7c15330 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -24618,7 +24618,7 @@ normal_char_ascent_descent (struct font *font, int c, int *ascent, int *descent) /* A subroutine that computes a reasonable "normal character height" for fonts that claim preposterously large vertical dimensions, but - whose glyphs are actually reasonably sized. C is the charcater + whose glyphs are actually reasonably sized. C is the character whose metrics to use for those fonts, or -1 for default character. */ static int @@ -26761,7 +26761,7 @@ x_produce_glyphs (struct it *it) don't let the row ascent and descent values (and the row height computed from them) be smaller than the "normal" character metrics. This avoids unpleasant effects - whereby lines on display would change their heigh + whereby lines on display would change their height depending on which characters are shown. */ normal_char_ascent_descent (font, -1, &font_ascent, &font_descent); it->max_ascent = max (it->max_ascent, font_ascent); diff --git a/test/automated/help-fns.el b/test/automated/help-fns.el index 4815ac6..b8772eb 100644 --- a/test/automated/help-fns.el +++ b/test/automated/help-fns.el @@ -37,7 +37,7 @@ (defun abc\\\[universal-argument\]b\`c\'d\\e\"f (x) "A function with a funny name. -\(fn XYYZZY)" +\(fn XYZZY)" x) (defun defgh\\\[universal-argument\]b\`c\'d\\e\"f (x) @@ -50,7 +50,7 @@ (with-current-buffer "*Help*" (goto-char (point-min)) (should (search-forward - "(abc\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f XYYZZY)"))) + "(abc\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f XYZZY)"))) (describe-function 'defgh\\\[universal-argument\]b\`c\'d\\e\"f) (with-current-buffer "*Help*" (goto-char (point-min)) commit a281b3db3e1ac83f80db78ea1a5069069dd91942 Author: Paul Eggert Date: Sun Jun 14 22:24:03 2015 -0700 ; Omit mistaken update diff --git a/ChangeLog.2 b/ChangeLog.2 index 5935503..b8e1e38 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,10 +1,3 @@ -2015-06-14 Christoph Wedler - - Some generic support for multi-mode indentation. - * lisp/progmodes/prog-mode.el (prog-indentation-context): New - variable. - (prog-first-column, prog-widen): New convenience functions. - 2015-06-13 Glenn Morris Tweaks for getting repository version; a bit more like it was for bzr. commit 1f9974ad837b0ae3967dd126789ee7f7b04da8f9 Author: Glenn Morris Date: Sun Jun 14 16:33:05 2015 -0700 * lisp/version.el (emacs-repository-version-git): Demote errors. Check result is a hash. diff --git a/lisp/version.el b/lisp/version.el index 112611d..c0b975e 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -106,10 +106,11 @@ or if we could not determine the revision.") (with-temp-buffer (let ((default-directory (file-name-as-directory dir))) (and (eq 0 - (ignore-errors + (with-demoted-errors "Error running git rev-parse: %S" (call-process "git" nil '(t nil) nil "rev-parse" "HEAD"))) - (not (zerop (buffer-size))) - (replace-regexp-in-string "\n" "" (buffer-string)))))) + (progn (goto-char (point-min)) + (looking-at "[0-9a-fA-F]\\{40\\}")) + (match-string 0))))) (defun emacs-repository--version-git-1 (file) "Internal subroutine of `emacs-repository-get-version'." commit 3881af45bf104f54a851dc84becd0a6f744839c3 Author: Artur Malabarba Date: Sun Jun 14 22:48:18 2015 +0100 * lisp/emacs-lisp/package.el (package--with-work-buffer-async): Catch errors that happen before going async. (Bug#20809) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 981f42c..6827cc9 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1119,9 +1119,11 @@ buffer is killed afterwards. Return the last value in BODY." "Run BODY in a buffer containing the contents of FILE at LOCATION. If ASYNC is non-nil, and if it is possible, run BODY asynchronously. If an error is encountered and ASYNC is a -function, call it with no arguments (instead of executing BODY), -otherwise propagate the error. For description of the other -arguments see `package--with-work-buffer'." +function, call it with no arguments (instead of executing BODY). +The error is propagated either way. + +For a description of the other arguments see +`package--with-work-buffer'." (declare (indent 3) (debug t)) (macroexp-let2* macroexp-copyable-p ((async-1 async) @@ -1130,21 +1132,26 @@ arguments see `package--with-work-buffer'." `(if (or (not ,async-1) (not (string-match-p "\\`https?:" ,location-1))) (package--with-work-buffer ,location-1 ,file-1 ,@body) - (url-retrieve (concat ,location-1 ,file-1) - (lambda (status) - (if (eq (car status) :error) - (if (functionp ,async-1) - (funcall ,async-1) - (signal (cdar status) (cddr status))) - (goto-char (point-min)) - (unless (search-forward "\n\n" nil 'noerror) - (error "Invalid url response in buffer %s" - (current-buffer))) - (delete-region (point-min) (point)) - ,@body) - (kill-buffer (current-buffer))) - nil - 'silent)))) + ;; This `condition-case' is to catch connection errors. + (condition-case error-signal + (url-retrieve (concat ,location-1 ,file-1) + (lambda (status) + (if (eq (car status) :error) + (progn (if (functionp ,async-1) + (funcall ,async-1)) + (signal (cdar status) (cddr status))) + (goto-char (point-min)) + (unless (search-forward "\n\n" nil 'noerror) + (error "Invalid url response in buffer %s" + (current-buffer))) + (delete-region (point-min) (point)) + ,@body) + (kill-buffer (current-buffer))) + nil + 'silent) + (error (when (functionp ,async-1) + (funcall ,async-1)) + (signal (car error-signal) (cdr error-signal))))))) (defun package--check-signature-content (content string &optional sig-file) "Check signature CONTENT against STRING. commit 2f09f8952489b5c90488faf66f71a4252aed5c2c Author: Eli Zaretskii Date: Sun Jun 14 18:13:06 2015 +0300 Another improvement of documentation of set-fontset-font * doc/lispref/display.texi (Fontsets): Say explicitly that CHARACTER can be a single codepoint. * src/fontset.c (Fset_fontset_font): Doc fix. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b4e2037..9e9f8e3 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -3284,7 +3284,7 @@ field. @defun set-fontset-font name character font-spec &optional frame add This function modifies the existing fontset @var{name} to use the font -matching with @var{font-spec} for the character @var{character}. +matching with @var{font-spec} for the specified @var{character}. If @var{name} is @code{nil}, this function modifies the fontset of the selected frame or that of @var{frame} if @var{frame} is not @@ -3293,10 +3293,10 @@ selected frame or that of @var{frame} if @var{frame} is not If @var{name} is @code{t}, this function modifies the default fontset, whose short name is @samp{fontset-default}. -@var{character} may be a cons; @code{(@var{from} . @var{to})}, where -@var{from} and @var{to} are character codepoints. In that case, use -@var{font-spec} for all characters in the range @var{from} and @var{to} -(inclusive). +In addition to specifying a single codepoint, @var{character} may be a +cons @code{(@var{from} . @var{to})}, where @var{from} and @var{to} are +character codepoints. In that case, use @var{font-spec} for all the +characters in the range @var{from} and @var{to} (inclusive). @var{character} may be a charset. In that case, use @var{font-spec} for all character in the charsets. diff --git a/src/fontset.c b/src/fontset.c index 5fc92fe..f1a3e59 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1411,9 +1411,11 @@ Modify fontset NAME to use FONT-SPEC for TARGET characters. NAME is a fontset name string, nil for the fontset of FRAME, or t for the default fontset. -TARGET may be a cons; (FROM . TO), where FROM and TO are characters. -In that case, use FONT-SPEC for all characters in the range FROM and -TO (inclusive). +TARGET may be a single character to use FONT-SPEC for. + +Target may be a cons (FROM . TO), where FROM and TO are characters. +In that case, use FONT-SPEC for all characters in the range FROM +and TO (inclusive). TARGET may be a script name symbol. In that case, use FONT-SPEC for all characters that belong to the script. commit fce59d43e4d6890c1fb694a593dad828e3e3925d Author: Eli Zaretskii Date: Sun Jun 14 18:02:55 2015 +0300 Another improvement for symbol and punctuation characters * lisp/international/fontset.el (setup-default-fontset): Exclude from Symbola character ranges for symbols and punctuation covered well by popular Unicode fonts. Prefer fixed-misc Unicode font, if installed and where its coverage of symbols and punctuation is known to be good. (Bug#20727) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 696940e..acc3732 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -693,23 +693,44 @@ (cons (car math-subgroup) (nth 1 math-subgroup)) (font-spec :registry "iso10646-1" :script (nth 2 math-subgroup)))) - ;; Special setup for various symbols and some rarely used characters - ;; covered well by Symbola. + ;; Special setup for various symbols and punctuation characters + ;; covered well by Symbola, excluding those covered well by popular + ;; Unicode fonts. We exclude the latter because users don't like us + ;; invading on their font setups where they have good support from + ;; other fonts. (dolist (symbol-subgroup - '((#x0250 . #x02AF) ;; IPA Extensions - (#x2000 . #x206F) ;; General Punctuation + '((#x2000 . #x2012) ;; General Punctuation + (#x2015 . #x2017) + #x201F + (#x2023 . #x202F) + (#x2031 . #x2038) + (#x203B . #x206F) (#x2070 . #x209F) ;; Superscripts and Subscripts - (#x20A0 . #x20CF) ;; Currency Symbols - (#x2100 . #x214F) ;; Letterlike Symbols - (#x2150 . #x218F) ;; Number Forms - (#x2190 . #x21FF) ;; Arrows - (#x2200 . #x22FF) ;; Mathematical Operators - (#x2300 . #x23FF) ;; Miscellaneous Technical + (#x20A0 . #x20AB) ;; Currency Symbols + (#x20AD . #x20CF) + (#x2100 . #x2121) ;; Letterlike Symbols + (#x2123 . #x214F) + (#x2150 . #x215A) ;; Number Forms + (#x215F . #x218F) + (#x2194 . #x21FF) ;; Arrows + (#x2200 . #x2211) ;; Mathematical Operators + (#x2213 . #x2247) + (#x2249 . #x225F) + (#x2261 . #x2263) + (#x2266 . #x22FF) + (#x2300 . #x2301) ;; Miscellaneous Technical + (#x2303 . #x230F) + (#x2311 . #x231F) + (#x2322 . #x23FF) (#x2400 . #x243F) ;; Control Pictures (#x2440 . #x245F) ;; Optical Char Recognition (#x2460 . #x24FF) ;; Enclosed Alphanumerics (#x25A0 . #x25FF) ;; Geometric Shapes - (#x2600 . #x26FF) ;; Miscellaneous Symbols + (#x2600 . #x265F) ;; Miscellaneous Symbols + (#x2661 . #x2662) + #x2664 + (#x2667 . #x2669) + (#x266C . #x26FF) (#x2700 . #x27bF) ;; Dingbats (#x27C0 . #x27EF) ;; Misc Mathematical Symbols-A (#x27F0 . #x27FF) ;; Supplemental Arrows-A @@ -738,6 +759,31 @@ (set-fontset-font "fontset-default" '(#x2500 . #x259F) "FreeMono" nil 'prepend) + ;; Since standard-fontset-spec on X uses fixed-medium font, which + ;; gets mapped to a iso8859-1 variant, we would like to prefer its + ;; iso10646-1 variant for symbols, where the coverage is known to be + ;; good. + (dolist (symbol-subgroup + '((#x2000 . #x206F) ;; General Punctuation + (#x2070 . #x209F) ;; Superscripts and Subscripts + (#x20A0 . #x20CF) ;; Currency Symbols + (#x2150 . #x218F) ;; Number Forms + (#x2190 . #x21FF) ;; Arrows + (#x2200 . #x22FF) ;; Mathematical Operators + (#x2300 . #x23FF) ;; Miscellaneous Technical + (#x2400 . #x243F) ;; Control Pictures + (#x2440 . #x245F) ;; Optical Char Recognition + (#x2460 . #x24FF) ;; Enclosed Alphanumerics + (#x2500 . #x257F) ;; Box Drawing + (#x2580 . #x259F) ;; Block Elements + (#x25A0 . #x25FF) ;; Geometric Shapes + (#x2600 . #x2689) ;; Miscellaneous Symbols + (#x2700 . #x27bF) ;; Dingbats + (#x27F5 . #x27FF))) ;; Supplemental Arrows-A + (set-fontset-font "fontset-default" symbol-subgroup + "-*-fixed-medium-*-*-*-*-*-*-*-*-*-iso10646-1" + nil 'prepend)) + ;; Append CJK fonts for characters other than han, kana, cjk-misc. ;; Append fonts for scripts whose name is also a charset name. (let* ((data (build-default-fontset-data)) commit 52da972751d50c2bf27315c7cad96a185b5eb103 Author: Christoph Wedler Date: Sun Jun 14 14:47:16 2015 +0000 Some generic support for multi-mode indentation. * lisp/progmodes/prog-mode.el (prog-indentation-context): New variable. (prog-first-column, prog-widen): New convenience functions. diff --git a/ChangeLog.2 b/ChangeLog.2 index b8e1e38..5935503 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,10 @@ +2015-06-14 Christoph Wedler + + Some generic support for multi-mode indentation. + * lisp/progmodes/prog-mode.el (prog-indentation-context): New + variable. + (prog-first-column, prog-widen): New convenience functions. + 2015-06-13 Glenn Morris Tweaks for getting repository version; a bit more like it was for bzr. diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index 0d9fabd..cb8aaad 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -48,6 +48,51 @@ map) "Keymap used for programming modes.") +(defvar prog-indentation-context nil + "Non-nil while indenting embedded code chunks. +There are languages where part of the code is actually written in +a sub language, e.g., a Yacc/Bison or ANTLR grammar also consists +of plain C code. This variable enables the major mode of the +main language to use the indentation engine of the sub mode for +lines in code chunks written in the sub language. + +When a major mode of such a main language decides to delegate the +indentation of a line/region to the indentation engine of the sub +mode, it is supposed to bind this variable to non-nil around the call. + +The non-nil value looks as follows + \(FIRST-COLUMN (START . END) PREVIOUS-CHUNKS) + +FIRST-COLUMN is the column the indentation engine of the sub mode +should usually choose for top-level language constructs inside +the code chunk (instead of 0). + +START to END is the region of the code chunk. See function +`prog-widen' for additional info. + +PREVIOUS-CHUNKS, if non-nil, provides the indentation engine of +the sub mode with the virtual context of the code chunk. Valid +values are: + + - A string containing code which the indentation engine can + consider as standing in front of the code chunk. To cache the + string's calculated syntactic information for repeated calls + with the same string, it is valid and expected for the inner + mode to add text-properties to the string. + + A typical use case is for grammars with code chunks which are + to be indented like function bodies - the string would contain + a corresponding function header. + + - A function called with the start position of the current + chunk. It will return either the region of the previous chunk + as \(PREV-START . PREV-END) or nil if there is no further + previous chunk. + + A typical use case are literate programming sources - the + function would successively return the code chunks of the + previous macro definitions for the same name.") + (defun prog-indent-sexp (&optional defun) "Indent the expression after point. When interactively called with prefix, indent the enclosing defun @@ -61,6 +106,27 @@ instead." (end (progn (forward-sexp 1) (point)))) (indent-region start end nil)))) +(defun prog-first-column () + "Return the indentation column normally used for top-level constructs." + (or (car prog-indentation-context) 0)) + +(defun prog-widen () + "Remove restrictions (narrowing) from current code chunk or buffer. +This function can be used instead of `widen' in any function used +by the indentation engine to make it respect the value +`prog-indentation-context'. + +This function (like 'widen') is useful inside a +`save-restriction' to make the indentation correctly work when +narrowing is in effect." + (let ((chunk (cadr prog-indentation-context))) + (if chunk + ;; no widen necessary here, as narrow-to-region changes (not + ;; just narrows) existing restrictions + (narrow-to-region (car chunk) (or (cdr chunk) (point-max))) + (widen)))) + + (defvar-local prettify-symbols-alist nil "Alist of symbol prettifications. Each element looks like (SYMBOL . CHARACTER), where the symbol commit 57e7666477a9cd14ad4f1386856686a23bfb87fd Author: Artur Malabarba Date: Sun Jun 14 14:40:48 2015 +0100 * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): Don't assume that `tabulated-list-printer' will leave point at the end of the buffer. (Bug#20810) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index fb3045d..4bf714b 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -347,7 +347,7 @@ changing `tabulated-list-sort-key'." (setq entry-id nil saved-pt (point))) ;; If the buffer this empty, simply print each elt. - (if (eobp) + (if (or (not update) (eobp)) (apply tabulated-list-printer elt) (while (let ((local-id (tabulated-list-get-id))) ;; If we find id, then nothing to update. commit 79bd666940b52252123ae52016b06f4e9456db41 Author: Glenn Morris Date: Sun Jun 14 06:24:02 2015 -0400 ; Auto-commit of ChangeLog files. diff --git a/ChangeLog.2 b/ChangeLog.2 index ef261f1..b8e1e38 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,366 @@ +2015-06-13 Glenn Morris + + Tweaks for getting repository version; a bit more like it was for bzr. + * lisp/version.el (emacs-repository-version-git) + (emacs-repository--version-git-1): New functions, + split from emacs-repository-get-version. + (emacs-repository-get-version): Make the second argument meaningful. + + * lisp/startup.el (command-line-1): Inform if skipping relative + file names due to deleted PWD. + + * src/xsmfns.c (x_session_initialize): Avoid libSM crash + when starup directory is missing. (Bug#18851) + (errno.h): Include it. + +2015-06-13 Paul Eggert + + Better fix for documenting `X as "`X" + Fix suggested by Stefan Monnier. + * lisp/help-fns.el (help-fns--signature): + Insert "`X", not "(\` X)", when documenting `X (Bug#20759). + * lisp/help.el (help-split-fundoc, help--make-usage-docstring): + Don't treat `X specially, as help-fns--signature now handles this. + +2015-06-13 Eli Zaretskii + + Improve the default fontset when Symbola is not installed + * lisp/international/fontset.el (setup-default-fontset): Only + prepend Symbola and FreeMono font specs for symbols and + punctuation; do not replace the default spec for them. This + should have better results when Symbola/FreeMono are not + installed. (Bug#20727) + + Improve documentation of ':lang' in font specs + * src/font.c (Ffont_spec): Doc fix: elaborate on the values and + use of the ':lang' property of the font spec. + * doc/emacs/frames.texi (Fonts): Document the language names that + can be in the STYLE part of XLFD. + * doc/lispref/display.texi (Low-Level Font): Document the ':lang' + property. + + * nt/README: Don't advertise the (obsolescent) w32 FAQ. + + * nt/README.W32: Don't advertise the (obsolescent) w32 FAQ. + + Revert last change in fontset.el + * lisp/international/fontset.el (setup-default-fontset): Revert + the change "Configure Symbola font only if installed", since font + search is evidently not yet set up when this function is called. + (Bug#20727) + +2015-06-12 Glenn Morris + + Ensure early startup warnings are visible at the end. (Bug#20792) + * lisp/emacs-lisp/warnings.el (display-warning): + If startup isn't complete, delay the warning. + * lisp/startup.el (normal-top-level, command-line): + Let display-warning automatically handle the needed delays. + Run delayed-warnings-hook. + + * lisp/version.el (emacs-repository-get-version): + Avoid calling external executable if possible. (Bug#20799) + +2015-06-12 Paul Eggert + + Document `X as "`X", not as "(` X)" + * lisp/help.el (help-split-fundoc, help--make-usage-docstring): + Document (backquote FOO) as "`FOO", not as "(` FOO)" (Bug#20759). + + * src/print.c (print_object): Minor simplification. + +2015-06-12 Glenn Morris + + * src/buffer.c (init_buffer): Add final newline to message. + +2015-06-12 Paul Eggert + + Configure Symbola font only if installed + * lisp/international/fontset.el (setup-default-fontset): + Don't specify the Symbola font if it's not installed. + Likewise for FreeMono. (Bug#20727) + +2015-06-12 Eli Zaretskii + + Configure Symbola font only for symbols and punctuation + * lisp/international/fontset.el (setup-default-fontset): Leave + only symbols and punctuation in the fontset setup for Symbola + font; remove "Greek and Coptic" and "Cyrillic Supplement". + (Bug#20798) + +2015-06-12 Andreas Schwab + + Fix crash in fontset-info + * src/fontset.c (Ffontset_info): Check that the RFONT-DEF elt is + non-nil. + +2015-06-12 Paul Eggert + + Port to Solaris 10 sparc + Sun C 5.13 + * configure.ac (SETUP_SLAVE_PTY) [sol2* | unixware]: + Adjust to process.c change. + * src/process.c (create_process): Declare volatile variables at + top level of this function, so that they're less likely to be + reused later in the function in the code executed by the vforked + child. Do not declare locals used only in the vforked child, as + they might share memory with locals still live in the parent. + Instead, use the same variables in the child as in the parent. + This works around a subtle bug that causes a garbage collector + crash when Emacs is built with Sun C 5.13 sparc on Solaris 10. + +2015-06-12 Glenn Morris + + * lisp/startup.el (normal-top-level): Don't let *Messages* get + a nil default-directory. + +2015-06-11 Glenn Morris + + * lisp/startup.el (normal-top-level): Use delay-warning. (Bug#20792) + + Some progress towards starting with PWD deleted. (Bug#18851) + * src/buffer.c (init_buffer): Handle get_current_dir_name failures. + * lisp/startup.el (normal-top-level, command-line-1): + * lisp/minibuffer.el (read-file-name-default): + Handle default-directory being nil. + +2015-06-11 Paul Eggert + + Fix "not a tty" bug on Solaris 10 + * configure.ac (PTY_OPEN): Define to plain 'open' + on SVR4-derived hosts, so that the O_CLOEXEC flag isn't set. + * src/process.c (allocate_pty): Set the O_CLOEXEC flag after + calling PTY_TTY_NAME_SPRINTF, for the benefit of SVR4-derived + hosts that call grantpt which does its work via a setuid subcommand + (Bug#19191, Bug#19927, Bug#20555, Bug#20686). + Also, set O_CLOEXEC even if PTY_OPEN is not defined, since it + seems relevant in that case too. + +2015-06-11 Juri Linkov + + * lisp/bindings.el (debug-ignored-errors): Add mark-inactive. + * lisp/simple.el (kill-region): Replace 'error' with 'user-error'. + (Bug#20785) + +2015-06-11 Glenn Morris + + * lisp/international/characters.el (char-script-table): Fix typo. + +2015-06-11 Paul Eggert + + Fix quoting of help for functions with odd names + While investigating Bug#20759, I discovered other quoting problems: + C-h f mishandled characters like backslash and quote in function names. + This fix changes the behavior so that 'C-h f pcase RET' now + generates "... (\` QPAT) ..." instead of "... (` QPAT) ...", + because '(format "%S" '(` FOO))' returns "(\\` FOO)". A comment + in src/lread.c's read1 function says that the backslash will be + needed starting in Emacs 25, which implies that 'format' is + correct and the old pcase documention was wrong to omit the backslash. + * lisp/emacs-lisp/nadvice.el (advice--make-docstring): + * lisp/help-fns.el (help-fns--signature): + * lisp/help.el (help-add-fundoc-usage): + * lisp/progmodes/elisp-mode.el (elisp-function-argstring): + Use help--make-usage-docstring rather than formatting + help-make-usage. + * lisp/emacs-lisp/pcase.el (pcase--make-docstring): + Return raw docstring. + * lisp/help-fns.el (help-fns--signature): New arg RAW, to return + raw docstring. Take more care to distinguish raw from cooked dstrings. + (describe-function-1): Let help-fns--signature substitute + command keys. + * lisp/help.el (help--docstring-quote): New function. + (help-split-fundoc): Use it, to quote funny characters more + systematically. + (help--make-usage): Rename from help-make-usage, since this + should be private. Leave an obsolete alias for the old name. + (help--make-usage-docstring): New function. + * test/automated/help-fns.el (help-fns-test-funny-names): New test. + +2015-06-11 Stefan Monnier + + * lisp/thingatpt.el (in-string-p): Revert last change, + since in-string-p is not used in thingatpt.el but only from outside. + Also, use lexical binding. + +2015-06-11 Artur Malabarba + + * lisp/let-alist.el (let-alist--deep-dot-search): Fix cons + * test/automated/let-alist.el (let-alist-cons): Test it. + +2015-06-11 Nicolas Richard + + * src/syntax.c (Fbackward_prefix_chars): Reword docstring + +2015-06-10 Glenn Morris + + * build-aux/gitlog-to-emacslog: Also ignore pointless merge commits. + + Improve generated ChangeLog for gitmerge.el commits. (Bug#20717) + * build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits. + * admin/gitmerge.el (gitmerge-commit-message): + Exclude "skipped" messages from ChangeLog once again. + + Slight namespace cleanup for thingatpt.el. + * lisp/thingatpt.el (thing-at-point--in-string-p) + (thing-at-point--end-of-sexp, thing-at-point--beginning-of-sexp) + (thing-at-point--read-from-whole-string): Rename from + old versions without "thing-at-point--" prefix. + Keep old versions as obsolete aliases. Update all uses. + + * lisp/emacs-lisp/checkdoc.el (checkdoc-get-keywords): + Move requiring of finder from here... + (checkdoc-package-keywords): ... to here. + + Use 'user-error' in a few calendar files. + * lisp/calendar/appt.el (appt-add): + * lisp/calendar/calendar.el (calendar-absolute-from-gregorian) + (calendar-generate): + * lisp/calendar/diary-lib.el (diary-mail-entries, diary-cyclic): + Replace 'error' with 'user-error'. + + * lisp/progmodes/f90.el (f90-backslash-not-special): Use user-error. + + * lisp/files-x.el (add-file-local-variable): + Special-case 'lexical-binding'. (Bug#20641) + + * lisp/progmodes/executable.el (executable-self-display): Obsolete. + No longer autoload. + * doc/misc/autotype.texi (Executables): + Undocument executable-self-display. + + * lisp/progmodes/executable.el (executable-self-display): + Use non-obsolete tail syntax. (Bug#20779) + (executable-self-display): Doc update. + +2015-06-10 Stefan Monnier + + * lisp/emacs-lisp/checkdoc.el: Use lexical-binding + (finder-known-keywords): Silence byte-compiler. + +2015-06-09 Stefan Monnier + + * lisp/simple.el (eval-expression): Macroexpand before evaluating (bug#20730) + + * lisp/progmodes/sh-script.el: Better handle nested quotes + (sh-here-doc-open-re): Don't mis-match the <<< operator (bug#20683). + (sh-font-lock-quoted-subshell): Make sure double quotes within single + quotes don't mistakenly end prematurely the surrounding string. + + * lisp/progmodes/elisp-mode.el: Require cl-lib for cl-defstruct. + +2015-06-09 Glenn Morris + + * test/automated/Makefile.in (ELFILES): Sort. + + * Makefile.in (SUBDIR_MAKEFILES): + * lwlib/Makefile.in (WARN_CFLAGS): + Use built-in Make functions rather than echo+sed. + +2015-06-09 Eli Zaretskii + + Update char-script-table + * lisp/international/characters.el (char-script-table): Update + from Unicode 8.0 Draft. + + Improve font selection for punctuation and other symbols + * src/fontset.c (face_for_char): If the character's script is + 'symbol', and the font used for ASCII face has a glyph for it, use + the font for the ASCII face instead of searching the fontsets. + This comes instead of NS-specific code that used the current + face's font instead, which is now disabled due to undesirable + consequences. (Bug#20727) + +2015-06-08 Dmitry Gutov + + Skip past `#' to find BEG + * lisp/progmodes/elisp-mode.el (elisp-completion-at-point): Skip + past `#' to find BEG (bug#20771). + * test/automated/elisp-mode-tests.el + (elisp-completes-functions-after-hash-quote): New test. + +2015-06-08 Eli Zaretskii + + Fix compilation warning/error in --without-x builds + * src/xdisp.c (append_space_for_newline): Condition GUI-specific + code on HAVE_WINDOW_SYSTEM. + + Improve the default fontset wrt symbols + * lisp/international/fontset.el (setup-default-fontset): Better + setup of fontset-default for symbols: use Symbola and FreeMono. + (Bug#20727) + +2015-06-08 Oleh Krehel + + Add new command checkdoc-package-keywords + * lisp/emacs-lisp/checkdoc.el (checkdoc-package-keywords-flag): New + defcustom. + (checkdoc-list-of-strings-p): Add doc. + (checkdoc-current-buffer): When `checkdoc-package-keywords-flag' is + non-nil, call `checkdoc-package-keywords'. + (checkdoc-get-keywords): New defun. + (checkdoc-package-keywords): New command. Warns if the current file + has package.el-style keywords that aren't in `finder-known-keywords'. + * etc/NEWS: Add entry. + +2015-06-08 Eli Zaretskii + + Avoid crashes when key-binding is called from a timer + * src/keymap.c (Fkey_binding): Don't segfault if called with an + empty vector as KEY. (Bug#20705) + + Fix a thinko in arc-mode.el + * lisp/arc-mode.el (archive-zip-summarize): Fix last change in the + non-Zip64 case. (Bug#20769) + +2015-06-08 Artur Malabarba + + * lisp/emacs-lisp/package.el (package-delete): Make interactive + +2015-06-08 Oleh Krehel + + checkdoc.el (checkdoc-file): New function + * lisp/emacs-lisp/checkdoc.el (checkdoc-error): When + `checkdoc-diagnostic-buffer' is set to "*warn*", print the warning + to the standard output. + (bug#20754) + +2015-06-07 Glenn Morris + + * admin/update_autogen (changelog_files): Remove gitlog-to-emacslog. + + * src/font.c (syms_of_font) : Doc fix. + + Remove the obsolete leading "*" from some C doc strings. + * src/coding.c (syms_of_coding): + * src/font.c (syms_of_font): Remove leading "*" from docs. + * lisp/cus-start.el (enable-character-translation): Add it. + +2015-06-07 Paul Eggert + + Move gen_origin from program to data + That way, 'make change-history' needs to change only ChangeLog.2, + instead of having to change two files. + * ChangeLog.2: Add commit info for range that this file covers. + * Makefile.in (new_commit_regexp): New macro. + (change-history-nocommit): Simplify, by putting what used to be + the gen_origin value into the data (ChangeLog.2) rather than + into the program (gitlog-to-emacslog). + * build-aux/gitlog-to-emacslog (gen_origin): Calculate from + the input file (e.g., ChangeLog.2) rather than by having a + constant in the program. Substitute it into the output. + +2015-06-07 Dmitry Gutov + + Escape any quotes in the function name + * lisp/help-fns.el (help-fns--signature): Quote any quotes in the + function name (bug#20759). + +2015-06-07 Eli Zaretskii + + Adapt 'struct timespec' to next release of MinGW runtime + * nt/inc/ms-w32.h (struct timespec): Don't declare if + __struct_timespec_defined is defined. + 2015-06-06 Paul Eggert Merge from gnulib @@ -5570,7 +5933,7 @@ This file records repository revisions from commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to -commit 325bf192ae281046834884b12705d6c522871b24 (inclusive). +commit 86076e65524933f7d1c9812cec292fdc7d5dc60c (inclusive). See ChangeLog.1 for earlier changes. ;; Local Variables: