1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00
Commit Graph

136 Commits

Author SHA1 Message Date
Paul Eggert
0274862f39 Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...

# Conflicts:
#	ChangeLog.2
#	src/lisp.h
2016-08-05 14:10:30 -07:00
Paul Eggert
92e5b41c7c Spelling and minor grammar fixes
* test/file-organization.org: Rename from test/file-organisation.org.
2016-08-05 13:35:13 -07:00
Nicolas Petton
26685000d8
;; * ChangeLog.2: ChangeLog update. 2016-07-24 16:56:01 +02:00
Nicolas Petton
7acfaead6d
; ChangeLog fixes 2016-07-24 16:41:47 +02:00
Paul Eggert
d9088290ef Merge from origin/emacs-25
2317c61 Fix last todo-mode change
5d4d8a3 Improve last todo-mode fix
d7084f2 Fix todo-mode use of minibuffer completion keymap (bug#23695).
27dec52 * src/alloc.c (ALIGN): Avoid error on DragonFly BSD.  (Bug#23...
f526191 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid ...
e881070 * lisp/help-fns.el (describe-function-1): Avoid reporting adv...
d308aa1 Minor grammar fix (bug#23746)
20de667 Doc fixes for grammar and typos (bug#23746)
a67a4e5 * doc/lispref/processes.texi (Process Buffers): Minor rewordi...
27f440e Add cross-reference to ELisp manual
10802d8 ; make change-history-commit
4b2d77d * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bu...
12e009e Restore initial undo boundary with viper
291fe0a Revert "Fix viper undo breakage from undo-boundary changes"
6921f4a Fix dbus crash on 32-bit Cygwin
2016-06-19 00:53:51 +02:00
Glenn Morris
10802d8472 ; make change-history-commit 2016-06-12 13:07:11 -04:00
Nicolas Petton
78f9af707f
; ChangeLog fixes
* ChangeLog.2:
* lisp/ChangeLog.17: Fix ChangeLog entries
2016-04-22 18:54:52 +02:00
Paul Eggert
435da5d295 Merge from origin/emacs-25
b134c20 Sync with gnulib
bb30fa9 Fix last change on 2016-01-02
488a72f ; Spelling fixes
9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3
0e7bcec Avoid crashes due to unreasonably large or small text scaling
85f257c Improve documentation of 'with-eval-after-load'
668c7bc Improve handling of non-ASCII characters in Git log messages
b570769 Remove undefined behavior in OS X dumper.
97211f3 Fix clipping of xwidgets
e87fbc0 Improve Lisp-level documentation of tooltips
9f1786e Faces names should not end in "-face".
3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
a1f221b Comint and compile no longer set EMACS
5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
c93ae7a Allow to customize names of executables used by grep.el
f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
a3f1ac2 Avoid infinite loop in 'studlify-word'
f36df4b Don’t recommend obsolete EMACS env var
fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need...
2016-04-11 09:07:16 -07:00
Paul Eggert
488a72f8e3 ; Spelling fixes 2016-04-10 23:55:05 -07:00
Paul Eggert
a11756ad0e Spelling fixes 2016-04-03 23:17:09 -07:00
Paul Eggert
1e5327c7c7 ; Backport ChangeLog.2 fixes from master 2016-03-22 13:22:50 -07:00
John Wiegley
17982e08d7 Merge from origin/emacs-25
d6f6b7d * etc/AUTHORS: Update the AUTHORS file
5cf7c39 authors.el updates
a26f193 ; fix changelog entries
fbc85c7 ; make change-history-commit
06da00c Fix Bug#22859
ab30bf5 ; * src/w32proc.c: Update the commentary to sys_select.
1481029 Fix reordering of bidi text in an isolate inside an override
60e0596 Document c-guess-basic-syntax in the CC Mode manual.
2016-03-03 23:53:38 -08:00
Nicolas Petton
a26f1933db ; fix changelog entries 2016-03-02 17:03:21 +01:00
Nicolas Petton
fbc85c79ba ; make change-history-commit 2016-03-02 13:46:19 +01:00
John Wiegley
220613e089 Merge from origin/emacs-25
d4b93e1 Minor fixes in global-auto-composition-mode
02b037b Allow arithmetic operators inside C++ template constructs.
44b16f6 Avoid crashes in semi-malformed 'condition-case'
652e5b4 Allow arithmetic operators inside C++ template constructs.
d9ea795 Fix regression with 'recent-keys' and keyboard macros
903603f Fix wording in a doc-view.el comment
cf79616 ; Spelling fixes
f8bf1b3 CONTRIBUTE cleanups and updates
f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang
1834ac7 Port to x86 GCC 4.3.1 and earlier
8482949 Fix point movement under 'scroll-conservatively'
c1313b5 Replace colon in file name (not legal on Windows)
f7af26c Fix a typo in edt.texi
8badf95 Make 'mmap_realloc' on MS-Windows more reliable
856cd94 Grep alias `all' shall not match parent directory
2016-02-15 14:11:03 -08:00
John Wiegley
c79978fcad Merge from origin/emacs-25
dacde7e * etc/AUTHORS: Update the AUTHORS file
478ca5d ; fix changelog entries
2b7d006 ; make change-history-commit
851decb * lisp/dired-aux.el: Require cl-lib.  (Bug#22613)
47896c8 ; Improve commentary in insdel.c
53ca1e1 Index tilde characters in names of backup files
d97f522 Document deprecation of hi-lock-mode's 'C-x w' bindings
b55f06d ; * etc/NEWS: Use double spaces to end a sentence.
28bb214 Announce that the `C-x w' bindings are deprecated
1c98f98 Suppress GNUstep hardening
d82f24b Fix redisplay after a large insertion
85a2753 Revert "Fix gnus-group-get-new-news-this-group on group with
        closed server"
e8e3db0 ; Improve merge documentation in CONTRIBUTE
5be9989 * lib-src/make-docfile.c: Include stdarg.h.
c95ebbf Extend gpm-mouse-mode's doc string and doc to point out
        limitations.
2016-02-15 14:10:25 -08:00
Paul Eggert
cf79616133 ; Spelling fixes 2016-02-14 19:45:12 -08:00
Glenn Morris
cc6d906490 ; Auto-commit of ChangeLog files. 2016-02-14 07:26:10 -05:00
Glenn Morris
e3d608cdc7 ; Auto-commit of ChangeLog files. 2016-02-14 06:24:15 -05:00
Nicolas Petton
478ca5de54 ; fix changelog entries 2016-02-13 20:28:54 +01:00
Nicolas Petton
2b7d006460 ; make change-history-commit 2016-02-13 19:29:35 +01:00
Paul Eggert
f414fe61dd ; make change-history-commit 2016-02-09 14:21:01 -08:00
Glenn Morris
4c629d8a8d ; ChangeLog fixes. 2016-02-08 08:48:47 -08:00
Glenn Morris
d7933ff2ac ; Auto-commit of ChangeLog files. 2016-02-07 07:23:56 -05:00
Glenn Morris
90c647b97f ; Auto-commit of ChangeLog files. 2016-02-07 06:30:00 -05:00
John Wiegley
0608bf1c3d Merge from origin/emacs-25
ee73997 Make erc work better when encountering unknown prefix chars
b99141d Make erc completion case-insensitive again
66c4620 Make complection in erc use consistent casing
8c562b2 Make /QUIT in erc more robust
d93d2c5 Make tracking faces in Emacs work more reliably
af6ab7e Make shr not bug out on images on non-graphical displays
3311f40 Fix bookmark display widths
d90ab1e Fix typo in eww-make-unique-file-name
7f81825 Make it possible to TAB to input fields
a43a1dc Insert complete alt texts when images are disabled
56ed4e1 Allow eww text fields to grow
66b315c Make erc work when subword-mode is switched on
255b68f Fix IMAP doc example
91557f5 Quoting fixes in doc strings and diagnostics
2c0dc9f Fix warning message in hack-local-variables
504696d Etags: yet another improvement in Ruby tags
8784ebf Fix x-popup-menu on TTYs without a mouse
8b87ecb * lisp/emacs-lisp/map.el: Improvements to the docstring of the
        pcase macro
6191003 Use pop-to-buffer-same-window in eww
fe321fd * autogen.sh: Revert all recent changes.
74ebd4a * make-dist: Updates related to nt/.
737193a * make-dist: Add modules/.
3696bf2 * make-dist: Update for super-special file that can't live in etc/.
a4278e2 Fix failure to compile ns-win.el in parallel builds
860da4d Fix names of tags generated for Ruby accessors
f6213ce Fix file-name recognition in 'etags'
e42e662 Change Ruby file names and extensions recognized by 'etags'
58bfb6a More improvements for Ruby support in 'etags'
c04e911 Add --git-config option to autogen.sh
5713466 Fix editing undo changes in eww fields
51362d6 Allow the user more control of popping up the eww window
ee0fbd8 Make eww-browse-url with new-window parameter work again
9c3142d Clean up eww code slightly
cb035f3 Don't insert nil faces in shr
4c3fae3 ; * lisp/progmodes/prolog.el: Remove some obsolete commentary.
93f2153 Improve the custom type of some user options.
9f60d7e Mark some risky calendar variables.
1d07dcd Highlight two additional SCSS keywords
ee8b466 Recommend enabling integrity-checking in git
e639e10 Some corrections in Elisp manual
d766ca8 Chatter when autogen.sh changes Git configuration
3b734e1 * org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
43cb9f8 Omit unnecessary history from Lisp intro
2fbd1da * etc/HISTORY: Add some more history, plus git tags.
c90e1b4 Improve elisp “Security Considerations” doc
cedd7ca autogen.sh now arranges for git to check hashes
86ce76b ; Fix ChangeLog.2 commit ID.
7b1d2b1 Fix (c & 040) typo in emergency escapes
a8273da Fix display of overlay strings with 'display' and 'box' property
fc48106 Fix imap-starttls-open
cdecbed Fix return value of imap-starttls-open
20c7e34 ; * etc/NEWS: Fix renamed command name
98bdbdb Correct reference to DARWIN_OS preprocessor symbol
b250d29 Spelling fix
b920a0e Spelling fixes
93b144b Pacify GCC on C library without glibc API
2016-02-03 23:56:08 -08:00
John Wiegley
1829a1fc85 Merge from origin/emacs-25
ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
        priority of non-free Chrome.
0fac75f Improve the custom type of some user options.
2df0e04 Highlight CSS variables with variable name face
3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
        user-serviceable.
2a5233c Mark some user options that can get evalled as risky.
39b166f Disable DebPrint in sys_read on MS-Windows
9fd0189 ;Fix ChangeLog entry
4bb7233 Fix typos in Introduction to Emacs Lisp manual
2016-02-03 23:54:45 -08:00
Paul Eggert
475b1efd4e ; Fix ChangeLog.2 commit ID. 2016-01-31 12:37:30 -08:00
Paul Eggert
86ce76b8e3 ; Fix ChangeLog.2 commit ID. 2016-01-31 12:18:46 -08:00
Paul Eggert
ffbf163ab5 ; Try to clean up ChangeLog.2 mess created by merge. 2016-01-30 15:26:09 -08:00
Paul Eggert
935b4d0ce4 ; Update ChangeLog.2 commit by hand 2016-01-30 14:10:42 -08:00
Paul Eggert
99fa8c3dbf - 2016-01-30 13:56:23 -08:00
Paul Eggert
9304e6d3a2 - 2016-01-30 11:41:07 -08:00
Martin Rudalics
9fd0189337 ;Fix ChangeLog entry 2016-01-30 18:28:26 +01:00
Nicolas Petton
e6b7b6d89f ; ChangeLog fixes
* ChangeLog.2: Auto-update of the ChangeLog file, as well as entry
  fixes.
2016-01-30 16:00:54 +01:00
Nicolas Petton
5152b211e8 ; ChangeLog fixes
* ChangeLog.2:
* doc/emacs/ChangeLog.1:
* lisp/ChangeLog.17: Fix ChangeLog entries
2016-01-24 13:31:54 +01:00
Glenn Morris
6d25cbeaaf ; Auto-commit of ChangeLog files. 2016-01-24 06:23:36 -05:00
John Wiegley
6acd2aa02c - 2016-01-18 22:56:33 -08:00
Glenn Morris
28a1ff3693 ; Auto-commit of ChangeLog files. 2016-01-17 06:23:45 -05:00
Glenn Morris
0d7bdee577 ; ChangeLog fix 2016-01-12 20:03:02 -05:00
Glenn Morris
4dc28fe902 ; Some ChangeLog fixes. It remains a complete mess. 2016-01-12 15:31:14 -05:00
John Wiegley
1dd4f26ab6 Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
2016-01-11 22:48:07 -08:00
Glenn Morris
eb0643c74d ; Auto-commit of ChangeLog files. 2016-01-10 06:24:04 -05:00
Glenn Morris
ef069ca8cc ; Auto-commit of ChangeLog files. 2016-01-03 06:25:27 -05:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
John Wiegley
9f2f14a072 Merge emacs-25 into master (using imerge) 2015-12-29 21:40:28 -08:00
Glenn Morris
c57d000a94 ; Auto-commit of ChangeLog files. 2015-12-27 06:23:49 -05:00
Glenn Morris
1868954320 ; Auto-commit of ChangeLog files. 2015-12-20 06:24:07 -05:00
Glenn Morris
23b5c22703 ; Auto-commit of ChangeLog files. 2015-12-13 06:25:35 -05:00
Glenn Morris
8f725564b6 ; Auto-commit of ChangeLog files. 2015-12-06 06:32:23 -05:00