1. 02 May, 2016 27 commits
    • Aaron Conole's avatar
      Call va_end in boot_error · 33d6250a
      Aaron Conole authored
      * src/gnutls.c (boot_error): A recent change added a function
      to signal an error or return an error code. That function uses
      a variadic argument list to populate an error message
      string. However, it missed calling va_end after using the
      variadic argument list.
        Copyright-paperwork-exempt: yes
    • Aaron Conole's avatar
      Fix the call to set_network_coding_system · 4639bc99
      Aaron Conole authored
      * src/process.c (Fmake_network_process): A recent commit
      modified the set_network_socket_coding_system function to take
      arguments host, service, and name. However, those arguments
      appear to be swapped.
        Copyright-paperwork-exempt: yes
    • Lars Ingebrigtsen's avatar
      Revert "alas, a map can have only one parent" · 6b3d6485
      Lars Ingebrigtsen authored
      This reverts commit d05806fd.
      This had already been fixed by using `make-composed-map'.  And
      we don't want image-map to inherit from special-mode-map, anyway.
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · 2bf7bc41
      Paul Eggert authored
      bf21c84f Fix quoting problem in cc-engine debug message
      8f366145 Add electric-quote-string unit test
      62805310 Don’t electrically quote ‘'’ in Python
      fd7b430a `nreverse' Grep hits before passing them to xref--convert-hits
    • Paul Eggert's avatar
      Fix quoting problem in cc-engine debug message · bf21c84f
      Paul Eggert authored
      * lisp/progmodes/cc-engine.el (c-replay-parse-state-state):
      Use "%s" format to pass through ‘'’ unscathed (Bug#23425), and
      likewise for ‘`’, and ‘%’.
    • Philipp Stephani's avatar
      Add electric-quote-string unit test · 8f366145
      Philipp Stephani authored
      * test/automated/electric-tests.el (electric-quote-string): New test.
    • Paul Eggert's avatar
      Don’t electrically quote ‘'’ in Python · 62805310
      Paul Eggert authored
      Problem reported by Philipp Stephani (Bug#23387).
      * lisp/electric.el (electric-quote-post-self-insert-function):
      Do not requote a string starter or ender.
    • Sam Steingold's avatar
      alas, a map can have only one parent · d05806fd
      Sam Steingold authored
      * lisp/image-mode.el (image-model-map): Cannot have two parents.
      * lisp/image.el (image-map): Inherit from `special-mode-map'.
    • Michael Albinus's avatar
      ; Fix last commit in tramp-tests.el · 1d287665
      Michael Albinus authored
    • Dmitry Gutov's avatar
      `nreverse' Grep hits before passing them to xref--convert-hits · fd7b430a
      Dmitry Gutov authored
      * lisp/progmodes/xref.el (xref-collect-matches): `nreverse' hits
      before passing them to xref--convert-hits.  Fixes a regression
      from cc0b7132.
    • Michael Albinus's avatar
      Fix Bug#10085 · 1997d09f
      Michael Albinus authored
      * lisp/net/tramp.el (tramp-find-foreign-file-name-handler):
      Add optional arguments OPERATION and COMPETION.  Handle
      `file-name-as-directory', `file-name-directory' and
      `file-name-nondirectory' also in completion mode.
      (tramp-file-name-handler): Use it.  (Bug#10085)
      * test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
      Extend test.
    • Martin Rudalics's avatar
    • Paul Eggert's avatar
      Tweak .gitignore · fa51e91e
      Paul Eggert authored
      * .gitignore: Remove leim/changed.misc, leim/changed.tit,
      as these files are no longer created.  Add gmon.out, for
      -pg profiling.  Sort.
    • Paul Eggert's avatar
      ; Spelling and quoting fixes · 743a32a1
      Paul Eggert authored
    • Paul Eggert's avatar
      Sync from gnulib · 3707f609
      Paul Eggert authored
      This incorporates:
      2016-05-01 mktime: port to stricter signed overflow checking
      2016-05-01 mktime: speed up DEBUG_MKTIME benchmarks
      2016-05-01 mktime: resurrect DEBUG_MKTIME testing
      2016-05-01 mktime: simplify DEBUG_MKTIME
      2016-05-01 Port mktime_internal offset to unsigned time_t
      2016-04-27 xstrtol: prohibit monstrosities like "1bB"
      2016-04-13 mktime: improve integer overflow checking
      2016-04-13 intprops: check two's complement assumption
      2016-04-13 intprops, mktime, strtol: assume two's complement
      * lib/intprops.h, lib/mktime-internal.h, lib/mktime.c:
      * lib/strtol.c, lib/timegm.c, m4/mktime.m4, m4/std-gnu11.m4:
      Copy from gnulib.
    • Paul Eggert's avatar
      ; Fix texinfo typo · 13f4efb0
      Paul Eggert authored
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · 3354582b
      Paul Eggert authored
      c695fb37 ; Spelling fixes
      03750c00 * doc/misc/texinfo.tex: Sync from gnulib.
      42fed3b8 * lisp/isearch.el (isearch-forward-symbol-at-point): Add isea...
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · 198ce5b1
      Paul Eggert authored
      The following commits were skipped:
      8aa41477 tramp.texi: Revert last change due to backward compatibility
      69f7940f cua-prefix-override-inhibit-delay doc fix
      350792e3 global-eldoc-mode doc fix
      c3b3b90a normal-top-level-add-subdirs-to-load-path doc fix
      9f27bcf2 isearch-search-fun-function doc tweak
      78ae8056 Fill some imenu--index-alist doc lines
      d1ab001b Fmarker_position doc string clarification
      8c66ebfc Further define-obsolete-* doc fixups
      25b4cf33 Describe WHEN in all the define-obsolete- macros
      6b395016 Mention with-silent-modifications in the lispref manual
      9722ae18 with-silent-modifications doc clarification
      3bc26a70 clear-visited-file-modtime doc string fix
      7b7b4c21 Document mode mode line variables
      7907b822 Add a cross ref to Optional Mode Line
      ecdb340c Add a doc string to display-time-string
      6d8c2d0f custom-buffer-style doc fix
      ef32be60 Rearrange the doc of query-replace slightly
      7350d3d7 apropos-print doc fix
      afb22577 completion-table-with-predicate doc string fix
      f3f45020 Fill the completion-table-with-predicate doc string
      983ad8d7 replace-match-maybe-edit doc clarification
      bbda22c6 add-timeout doc fix
      818fb69b Extremely minor doc fix in Choosing Window
      2abc85e4 Transform mentions of `eval-after-load' to `with-eval-after-l...
      ec392ff1 cursor-type doc fix
      ff834ffe Add a link from Tool Bar to Images
      93598ff3 (default-mode-line-format): More explicit obsolete info
      b04fcc4a Fcompare_buffer_substrings doc string clarification
      f92d0aa1 insert-file-contents-literally doc fix
      ad5572b2 Fix custom types for cursor-in-non-selected-windows
      2ef780f3 Doc clarification to mwheel-scroll
      ed8474e6 Clarify the doc of eval-expression-print-format
      8f1e784f Explictly explain that package-initialize loads the packages
      13786805 Have the doc strings of `load-path' and `require' mention eac...
      a73de71b Doc fix for insert-pair-alist
      619f1ede Move doc of backup-directory-alist to the Backup node
      0846f21b Tiny doc clarification for create-fontset-from-fontset-spec
      925af7e0 Fill the doc string of font-lock-keywords
      05194cbe Doc fix for font-lock-remove-keywords
      7a03d552 Clarify whitespace-style doc string
      651182d0 Doc fixed for next-error-buffer-p
      d815ba53 Tiny doc fix
      7b858857 Doc fix
      c3557740 delsel doc touch ups
      4a2f33d1 Doc fixes for menu-bar.el
      71795d4b Doc fix
      3852fd6e Minor doc clarification
      db20f896 Fill font-lock-mode doc string
      df6cee94 Wrap the auto-generated doc string
      dc960d97 Clarify hi-lock-find-patterns
      8748c21f Add a doc string to `winner-mode'
      02c1aa8f Doc fix for align-newline-and-indent
      bc6c294d Doc fix for `kbd'
      28ef870c Doc tweak
      92559c74 Link from (emacs)Exiting to (lisp)Killing Emacs
      cc00738f find-lisp doc touchups
      396747d0 Don't have the manual claim that it lists all CL incompatibil...
      3cbc1e34 Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]"
      de8349e1 Doc string change to enable-recursive-minibuffers
      cf33ae0c Clarify the `interactive' doc string slightly
      0a14d841 Clarify some doc strings
      351c079c Add some concept index entries for custom types
      3fc1ed8e Mention `lisp-indent-function' in the lispref manual
      9bd2af86 Clarify doc string of internal compilation function
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · 595195a1
      Paul Eggert authored
      d8affa3d Use ‘T *restrict’ proto, not ‘T[restrict]’
      d38d2a84 Fix documentation of 'url-retrieve-synchronously'
      586b2139 * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bu...
      # Conflicts:
      #	doc/misc/url.texi
      #	lisp/url/url.el
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · d6ec146f
      Paul Eggert authored
      The following commit was skipped:
      3cade20c ; Auto-commit of loaddefs files.
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · c3ed7cea
      Paul Eggert authored
      16e5e8e4 Fix last change to isearch-update (bug#23406)
      b755d988 Autoload cursor-sensor-inhibit (bug#23406)
      b52ebd4f org-map-entries: Fix org-agenda-prepare-buffers call
      86aa4094 Followup for last commit in the user manual
      70044595 Improve doc string of 'set-goal-column'
      ccdaf04c Fix the MSDOS build
      ffe701cb Remove \= from format string (bug#18190)
      1c58fa1d Fix variable-pitch font on MS-Windows
      c6077bfd Restore follow-scroll-up/down to scrolling by the combined si...
      b671e218 Revert unneeded change which harms syntactic parsing.  This f...
      48b24c9b Correct indentation of ids in a C++ enum after a protection k...
      5c3534ff * lisp/window.el (window--process-window-list): No-op if no p...
      734fb3ac Port dumping to NetBSD with PaX
      0255a70c Don't mistake `for' inside a function for a part of array com...
      # Conflicts:
      #	src/Makefile.in
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · 07fafe1e
      Paul Eggert authored
      The following commit was skipped:
      ff7e201e Fix bug#22891: wrong terminal width when a fringe width is zero.
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · a8da4d03
      Paul Eggert authored
      71fb0e06 Improve last change to vc-git-mode-line-string
      6858e77c Todo mode doc bug fix
      e55d0db9 Fix revision calculation in vc-git-mode-line-string
      ca87b349 ; Fix errant revert ccb75d72
      40bfebec Add Python 3.5 keyword "await"
      fa7886a4 Add new keywords of Python 3.5
      ccb75d72 Partially revert previous change.
      8ee168a7 ; * etc/NEWS: Update entry about color fonts on OS X with a w...
      b09ca274 Say why text-quoting-style is not a user option
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · ce923974
      Paul Eggert authored
      The following commits were skipped:
      935715a5 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F...
      6ac9892f ; Auto-commit of loaddefs files.
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · b57c1741
      Paul Eggert authored
      5a952eb7 Don't mention ~/.emacs.bmk literally in doc strings
      c338cf31 * etc/NEWS: Explain why multicolor font display is disabled o...
      c30d1b4a Port to Ubuntu 16.04 --enable-gcc-warnings
    • Paul Eggert's avatar
      ; Spelling fixes · c695fb37
      Paul Eggert authored
    • Paul Eggert's avatar
      * doc/misc/texinfo.tex: Sync from gnulib. · 03750c00
      Paul Eggert authored
  2. 01 May, 2016 13 commits