1. 02 Feb, 2018 24 commits
    • Glenn Morris's avatar
      396ed687
    • Glenn Morris's avatar
    • Noam Postavsky's avatar
      ; Merge from emacs-26 · 2b288eb9
      Noam Postavsky authored
      4c8157cf ; Let files-tests.el pass multiple times in a session
      99251ab6 ; Avoid process kill query during term tests
      2b288eb9
    • Noam Postavsky's avatar
      ; Let files-tests.el pass multiple times in a session · 4c8157cf
      Noam Postavsky authored
      * test/lisp/files-tests.el (files-test-local-variables): Use `cl-letf'
      instead of advice.  The advice was not being activated on the second
      run.
      4c8157cf
    • Noam Postavsky's avatar
      ; Avoid process kill query during term tests · 99251ab6
      Noam Postavsky authored
      * test/lisp/term-tests.el (term-test-screen-from-input): Just unset
      the process query-on-exit flag to rather than trying to end the
      process before the end of test (which is generally unreliable).
      99251ab6
    • Alan Mackenzie's avatar
      CC Mode: Fix an enum intro being parsed as defun-block-intro · d3090a3a
      Alan Mackenzie authored
      * lisp/progmodes/cc-engine.el (c-inside-bracelist-p): Return a bufpos rather
      than t for the enum case.
      (c-add-stmt-syntax, c-guess-continued-construct): Replace
      c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p, since the former
      does not recognize enum brace lists, but the latter does.
      
      * lisp/progmodes/cc-fonts.el (c-get-fontification-context): Replace
      c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p.
      d3090a3a
    • Philipp Stephani's avatar
      Properly integrate modules into the loading process (Bug#30164). · 0443411f
      Philipp Stephani authored
      * src/lread.c (Fload): Don't defer to module-load immediately when
      encountering a module, but use the normal loading machinery to
      properly set up load-history, check for recursive loads, print
      messages, etc.
      
      * test/src/emacs-module-tests.el (module/load-history): New test.
      (module/describe-function-1): Adapt test.
      
      * etc/NEWS: Mention fixed behavior.
      0443411f
    • Philipp Stephani's avatar
      Use 'defalias' in test module instead of 'fset'. · 75c663f8
      Philipp Stephani authored
      This puts functions defined in the module into the 'load-history'.
      
      * test/data/emacs-module/mod-test.c (bind_function): Use 'defalias'
      instead of 'fset'.
      
      * test/src/emacs-module-tests.el (module/describe-function-1): Adapt
      unit test.
      75c663f8
    • Philipp Stephani's avatar
      Add support for module functions to C-h f (Bug#30163). · f3d0db7f
      Philipp Stephani authored
      * lisp/help-fns.el (help-fns-function-description-header): Handle
      module functions.
      
      * test/src/emacs-module-tests.el (module/describe-function-1): New
      test.
      f3d0db7f
    • Michael Albinus's avatar
      Handle quoted remote file names for file notifications · 344750ae
      Michael Albinus authored
      * lisp/filenotify.el (file-notify-add-watch): Do not suppress
      other file name handlers when FILE is quoted.
      
      * test/lisp/filenotify-tests.el
      (file-notify-test-remote-temporary-file-directory):
      Beware quoted `temporary-file-directory'.
      
      * test/lisp/files-tests.el
      (files-tests-file-name-non-special-quote-unquote): Improve test.
      344750ae
    • Michael Albinus's avatar
      Minor tweaks in tramp-archive.el · b86b8ee0
      Michael Albinus authored
      * lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
      Bind `tramp-unknown-id-integer' and `tramp-unknown-id-string'
      in order to have minimal ownership information.
      b86b8ee0
    • Glenn Morris's avatar
      Merge from origin/emacs-26 · a893a4db
      Glenn Morris authored
      6f495abd (origin/emacs-26) Another round of manual fixups
      59344c43 * doc/lispref/customize.texi (Custom Themes): Clarify .el pre...
      6386efc8 * doc/emacs/entering.texi (Entering Emacs): Another wording fix.
      e21f0189 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bu...
      1c2fb04b * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug...
      b90e91ca Fix last change of @key markup
      f180075f * doc/emacs/entering.texi (Entering Emacs): Fix markup.
      a893a4db
    • Glenn Morris's avatar
      ; Merge from origin/emacs-26 · 8dd2edc7
      Glenn Morris authored
      The following commits were skipped:
      
      01932c8d Revert a1bbc490 (Bug#30243), do not merge
      855ae578 ; Auto-commit of loaddefs files.
      8dd2edc7
    • Glenn Morris's avatar
      Merge from origin/emacs-26 · c4f8b554
      Glenn Morris authored
      56c37bbd Use @key{} where it is missing in the manuals
      25c01983 Another round of manual fixes from proofreading
      c4f8b554
    • Eli Zaretskii's avatar
      Another round of manual fixups · 6f495abd
      Eli Zaretskii authored
      * doc/emacs/killing.texi (Killing by Lines): Clarify wording.
      Reported by David Bonnafous <dbonnafo@gmail.com> in
      emacs-manual-bugs@gnu.org.
      
      * doc/emacs/windows.texi (Other Window): Improve wording.
      Reported by Rasmus Sjostrom <ras.sjostrom@gmail.com> in
      emacs-manual-bugs@gnu.org.
      
      * doc/emacs/display.texi (Display Custom): Mention that line
      numbers are not displayed in the minibuffer and tooltips.
      
      * doc/emacs/mini.texi (Basic Minibuffer): Improve wording.
      * doc/emacs/regs.texi (Registers): More comma removal.  Suggested
      by "root@vxid.pw root@vxid.pw" <root@vxid.pw> in
      emacs-manual-bugs@gnu.org.
      
      * doc/emacs/display.texi (Auto Scrolling): Fix a typo.  Reported
      by Kevin Foley <kfoley15@gmail.com> in emacs-manual-bugs@gnu.org.
      
      * doc/emacs/display.texi (Scrolling): Fix grammar.
      (Horizontal Scrolling): Mention reasonable limits for hscroll-step
      float values.  Suggested by Jerome Truong <jerometruong@gmail.com>
      in emacs-manual-bugs@gnu.org.
      
      * doc/emacs/mini.texi (Minibuffer Edit): Add a missing comma.
      * doc/emacs/basic.texi (Position Info, Arguments, Repeating):
      Remove redundant commas.  Suggested by oldgaro
      <oldgaro@protonmail.com> in emacs-manual-bugs@gnu.org.
      
      * doc/emacs/kmacro.texi (Save Keyboard Macro): Clarify wording.
      Suggested by clemens.radermacher@posteo.de in
      emacs-manual-bugs@gnu.org.
      
      * doc/emacs/building.texi (Compilation Mode): Improve and simplify
      wording.  Suggested by drone <yoorobot@gmail.com> in
      emacs-manual-bugs@gnu.org.
      
      * doc/emacs/dired.texi (Dired Enter): Clarify wording.
      (Dired Deletion): Fix a typo.
      (Marks vs Flags): Mention that M-DEL in Dired asks for the mark
      character.  Fix typos.
      * doc/emacs/basic.texi (Moving Point, Erasing, Basic Undo)
      (Arguments): Some additional information about keys.  Reported by
      Francis Wright <f.j.wright@live.co.uk> in
      emacs-manual-bugs@gnu.org.
      6f495abd
    • Stefan Monnier's avatar
      * lisp/emacs-lisp/cconv.el (cconv-convert): Fix compiling compiled code · 6ff8b774
      Stefan Monnier authored
      Don't conv-convert the docstring arg of defvar/defconst.
      6ff8b774
    • Basil L. Contovounesios's avatar
    • Michael Albinus's avatar
      Fix quoting in tramp-find-inline-compress for w32 · ecc6257f
      Michael Albinus authored
      * lisp/net/tramp-sh.el (tramp-find-inline-compress): Improve command
      quoting for w32.  Reported by Chris Zheng <chriszheng99@gmail.com>.
      ecc6257f
    • Eli Zaretskii's avatar
    • Michael Albinus's avatar
      Handle quoted file names in filenotify.el · e08de2ba
      Michael Albinus authored
      * lisp/filenotify.el (file-notify-add-watch): Do not save
      quoted file names in `file-notify-descriptors'.
      
      * test/lisp/files-tests.el
      (files-file-name-non-special-notify-handlers): Do not expect
      to fail.
      e08de2ba
    • Michael Albinus's avatar
      Use file-name-quote{,d-p} in files-tests.el · 00c65bcf
      Michael Albinus authored
      * test/lisp/files-tests.el
      (files-tests-file-name-non-special-quote-unquote): New test.
      (files-tests--file-name-non-special--subprocess): Simplify.
      (files-tests--file-name-non-special--buffers)
      (files-tests--with-temp-non-special)
      (files-tests-file-name-non-special-directory-file-name)
      (files-tests-file-name-non-special-file-in-directory-p)
      (files-tests-file-name-non-special-file-name-all-completions)
      (files-tests-file-name-non-special-file-name-as-directory)
      (files-tests-file-name-non-special-file-name-completion)
      (files-tests-file-name-non-special-file-name-directory)
      (files-tests-file-name-non-special-find-backup-file-name)
      (files-tests-file-name-non-special-make-nearby-temp-file):
      Use `file-name-quote' and `file-name-quoted-p', respectively.
      00c65bcf
    • Noam Postavsky's avatar
      Test and fix "/:" quoted file name handlers (Bug#30243) · 65da409e
      Noam Postavsky authored
      Some w32 specific problems were discovered, but only worked around, as
      these are not serious, and not the focus of this bug fix:
          - The w32 implementation of `insert-directory doesn't handle a nil
          SWITCHES argument.
          - `dired-compress-file' does not operate correctly if the unquoted
          filename contains a ":" (e.g., C:/foo/bar).
      
      * lisp/files.el (file-name-non-special): Strip the "/:" from
      `default-directory' for `temporary-file-directory' operation; both
      arguments to `file-name-completion', `file-name-all-completion', and
      `file-equal-p' operations; `buffer-file-name' for
      `make-auto-save-file-name' and 'set-visited-file-modtime' operations.
      Don't touch any operands of `file-notify-rm-watch' and
      `file-notify-valid-p' as they receive descriptors; not file
      names (this is not sufficient to fix these operations for "/:" quoted
      file names though, these are fixed in a later commit).
      
      * test/lisp/files-tests.el (files-tests--with-temp-file): Give it a
      `debug' property.
      (files-tests--with-temp-non-special): New helper macro.
      (files-tests--file-name-non-special--subprocess): Simplify.
      (files-tests-file-name-non-special-quote-unquote)
      (files-file-name-non-special-notify-handlers)
      (files-file-name-non-special-handlers)
      (files-tests-file-name-non-special-access-file)
      (files-tests-file-name-non-special-add-name-to-file)
      (files-tests-file-name-non-special-byte-compiler-base-file-name)
      (files-tests-file-name-non-special-copy-directory)
      (files-tests-file-name-non-special-copy-file)
      (files-tests-file-name-non-special-delete-directory)
      (files-tests-file-name-non-special-delete-file)
      (files-tests-file-name-non-special-diff-latest-backup-file)
      (files-tests-file-name-non-special-directory-file-name)
      (files-tests-file-name-non-special-directory-files)
      (files-tests-file-name-non-special-directory-files-and-attributes)
      (files-tests-file-name-non-special-dired-uncache)
      (files-tests-file-name-non-special-dired-compress-handler)
      (files-tests-file-name-non-special-expand-file-name)
      (files-tests-file-name-non-special-file-accessible-directory-p)
      (files-tests-file-name-non-special-file-acl)
      (files-tests-file-name-non-special-file-attributes)
      (files-tests-file-name-non-special-file-directory-p)
      (files-tests-file-name-non-special-file-equal-p)
      (files-tests-file-name-non-special-file-executable-p)
      (files-tests-file-name-non-special-file-exists-p)
      (files-tests-file-name-non-special-file-in-directory-p)
      (files-tests-file-name-non-special-file-local-copy)
      (files-tests-file-name-non-special-file-modes)
      (files-tests-file-name-non-special-file-name-all-completions)
      (files-tests-file-name-non-special-file-name-as-directory)
      (files-tests-file-name-non-special-file-name-case-insensitive-p)
      (files-tests-file-name-non-special-file-name-completion)
      (files-tests-file-name-non-special-file-name-directory)
      (files-tests-file-name-non-special-file-name-nondirectory)
      (files-tests-file-name-non-special-file-name-sans-versions)
      (files-tests-file-name-non-special-file-newer-than-file-p)
      (files-tests-file-name-non-special-file-ownership-preserved-p)
      (files-tests-file-name-non-special-file-readable-p)
      (files-tests-file-name-non-special-file-regular-p)
      (files-tests-file-name-non-special-file-remote-p)
      (files-tests-file-name-non-special-file-selinux-context)
      (files-tests-file-name-non-special-file-symlink-p)
      (files-tests-file-name-non-special-file-truename)
      (files-tests-file-name-non-special-file-writable-p)
      (files-tests-file-name-non-special-find-backup-file-name)
      (files-tests-file-name-non-special-get-file-buffer)
      (files-tests-file-name-non-special-insert-directory)
      (files-tests-file-name-non-special-insert-file-contents)
      (files-tests-file-name-non-special-load)
      (files-tests-file-name-non-special-make-auto-save-file-name)
      (files-tests-file-name-non-special-make-directory)
      (files-tests-file-name-non-special-make-directory-internal)
      (files-tests-file-name-non-special-make-nearby-temp-file)
      (files-tests-file-name-non-special-make-symbolic-link)
      (files-tests-file-name-non-special-rename-file)
      (files-tests-file-name-non-special-set-file-acl)
      (files-tests-file-name-non-special-set-file-modes)
      (files-tests-file-name-non-special-set-file-selinux-context)
      (files-tests-file-name-non-special-set-file-times)
      (files-tests-file-name-non-special-set-visited-file-modtime)
      (files-tests-file-name-non-special-shell-command)
      (files-tests-file-name-non-special-start-file-process)
      (files-tests-file-name-non-special-substitute-in-file-name)
      (files-tests-file-name-non-special-temporary-file-directory)
      (files-tests-file-name-non-special-unhandled-file-name-directory)
      (files-tests-file-name-non-special-vc-registered)
      (files-tests-file-name-non-special-write-region): New tests.
      65da409e
    • Noam Postavsky's avatar
    • Noam Postavsky's avatar
  2. 01 Feb, 2018 11 commits
  3. 31 Jan, 2018 5 commits
    • Glenn Morris's avatar
      automerge: adjust meaning of -d option · 1a04d952
      Glenn Morris authored
      * admin/automerge (nocd): New variable, replacing $dir.
      (usage, -d): Option -d no longer takes an argument.
      1a04d952
    • Glenn Morris's avatar
      automerge: add option to work in specific directory · 113963a8
      Glenn Morris authored
      * admin/automerge (usage): Mention -d.
      (dir): New variable.
      (-d): New option.
      (main): If requested, cd to specified directory.
      113963a8
    • Michael Albinus's avatar
      56c37bbd
    • Glenn Morris's avatar
      automerge: add option to start with a reset · aac3ba4d
      Glenn Morris authored
      * admin/automerge (usage): Mention -r.
      (reset): New variable.
      (-r): New option.
      (main): If requested, do a reset and pull.
      aac3ba4d
    • Eli Zaretskii's avatar
      Another round of manual fixes from proofreading · 25c01983
      Eli Zaretskii authored
      * doc/emacs/search.texi (Incremental Search)
      (Nonincremental Search): Mention the menu bar and fix typos.
      Reported by David Bonnafous <dbonnafo@gmail.com> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/building.texi (Compilation): Improve wording.
      Suggested by drone <yoorobot@gmail.com> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/kmacro.texi (Basic Keyboard Macro): Clarify text.
      Suggested by Robert Pluim <rpluim@gmail.com> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/display.texi (Highlight Interactively, Fringes):
      Improve wording.  Suggested by Justin Heyes-Jones
      <justinhj@gmail.com> in emacs-manual-bugs@gnu.org.
      * doc/emacs/commands.texi (User Input, Commands): Add missing
      commas.
      * doc/emacs/screen.texi (Menu Bar): Mention keyboard keys to
      navigate menus.  Suggested by oldgaro <oldgaro@protonmail.com> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/search.texi (Not Exiting Isearch): Fix a typo.
      Reported by "Kocken, I.J. (Ilja)" <I.J.Kocken@uu.nl> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/basic.texi (Inserting Text): Mention one more label of
      RET.  Suggested by Francis Wright <f.j.wright@live.co.uk> in
      emacs-manual-bugs@gnu.org.
      * doc/emacs/text.texi (Paragraphs): Clarify text.  Reported by
      Marcin Borkowski <mbork@mbork.pl> in emacs-manual-bugs@gnu.org.
      * doc/emacs/maintaining.texi (Introduction to VC)
      (Why Version Control?, VCS Merging): Fix typos and section
      capitalization.  Suggested by "R. P. Dillon"
      <rpdillon@killring.org> in emacs-manual-bugs@gnu.org.
      * doc/emacs/modes.texi (Major Modes, Choosing Modes): Fix typos.
      Reported by clemens.radermacher@posteo.de in
      emacs-manual-bugs@gnu.org.
      25c01983