]> git.eshelyaron.com Git - emacs.git/log
emacs.git
8 years agoRemove packages obsoleted before Emacs 24.
Andrew Hyatt [Thu, 4 Feb 2016 05:13:36 +0000 (00:13 -0500)]
Remove packages obsoleted before Emacs 24.

In accordance with the policy discussed in the emacs-devel list,
packages that have been obsoleted for a full major release cycle are up
for deletion.

This removes almost all packages that are now eligible for deletion,
with the exception of "cl-compat", which seems it is likely to still be
used, and "optional", which offers some functionality that doesn't have
a replacement yet.

8 years agoMention context when resume from emergency escape
Paul Eggert [Wed, 3 Feb 2016 21:21:10 +0000 (13:21 -0800)]
Mention context when resume from emergency escape

That way, if the user has been doing something else for a while,
they are reminded of the situation when restarting Emacs,
and are more likely to understand the two questions.
* doc/emacs/trouble.texi (Emergency Escape): Document this.
* src/keyboard.c (handle_interrupt): Implement this.

8 years ago; Fix last aligned_alloc declaration change
Ken Brown [Wed, 3 Feb 2016 18:27:08 +0000 (13:27 -0500)]
; Fix last aligned_alloc declaration change

8 years agoPort aligned_alloc decl to Cygwin.
Paul Eggert [Wed, 3 Feb 2016 08:37:44 +0000 (00:37 -0800)]
Port aligned_alloc decl to Cygwin.

Problem reported by Ken Brown (Bug#22522#38).
* configure.ac (aligned_alloc): Check for decl too.
* src/lisp.h (aligned_alloc): Declare if not already declared.

8 years agoautogen.sh now configures git only on request
Paul Eggert [Wed, 3 Feb 2016 07:11:36 +0000 (23:11 -0800)]
autogen.sh now configures git only on request

* autogen.sh (do_autoconf, do_git): New vars.
Support new arguments --help, all, autoconf, git.
By default, just do autoconf-related configuration, not git.
Prefer 'echo' to 'cat <<EOF ...', as this tends to avoid temp files.
If GNU cp is available, use it to backup .git/config before
changing it.  When configuring git, chatter about what is being
done, and configure git to check hashes.  Avoid some duplicate
file name specification when creating git hooks.

* GNUmakefile (ALL_IF_GIT): New macro.
(configure): Use it.
* INSTALL.REPO: Suggest './autogen.sh all'.

8 years agoBuild with C11 if available
Paul Eggert [Tue, 2 Feb 2016 22:43:59 +0000 (14:43 -0800)]
Build with C11 if available

* admin/merge-gnulib (GNULIB_MODULES): Add std-gnu11.
* m4/std-gnu11.m4: New file, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.

8 years agoUpdate gnulib copy
Paul Eggert [Tue, 2 Feb 2016 22:35:05 +0000 (14:35 -0800)]
Update gnulib copy

* doc/misc/texinfo.tex: Copy from gnulib.

8 years ago* lisp/vc/add-log.el (change-log-directory-files, find-change-log):
Glenn Morris [Tue, 2 Feb 2016 18:14:45 +0000 (13:14 -0500)]
* lisp/vc/add-log.el (change-log-directory-files, find-change-log):
Doc tweaks.

8 years agoPort better to platforms lacking aligned_alloc
Paul Eggert [Tue, 2 Feb 2016 17:28:52 +0000 (09:28 -0800)]
Port better to platforms lacking aligned_alloc

Problem reported by Ken Brown (Bug#22522).
* src/lisp.h (hybrid_aligned_alloc)
[HYBRID_MALLOC && !HAVE_ALIGNED_ALLOC]: New decl.

8 years agoPort malloc.h hygiene fix to LTO
Paul Eggert [Tue, 2 Feb 2016 17:16:24 +0000 (09:16 -0800)]
Port malloc.h hygiene fix to LTO

* src/alloc.c (__malloc_initialize_hook):
Make it externally visible (Bug#22522).

8 years agoMake find-change-log prefer a VCS root, if no ChangeLog exists.
Glenn Morris [Tue, 2 Feb 2016 02:08:21 +0000 (21:08 -0500)]
Make find-change-log prefer a VCS root, if no ChangeLog exists.

* lisp/vc/add-log.el (change-log-directory-files): New option.
(find-change-log): Respect change-log-directory-files.
* doc/emacs/maintaining.texi (Change Log Commands):
Mention change-log-directory-files.
; * etc/NEWS: Mention this.

8 years agoDouble static heap size.
Paul Eggert [Mon, 1 Feb 2016 16:49:46 +0000 (08:49 -0800)]
Double static heap size.

* src/sheap.h (STATIC_HEAP_SIZE): Double it, since it was too
small on FreeBSD (Bug#22086).

8 years ago; Auto-commit of loaddefs files.
Glenn Morris [Mon, 1 Feb 2016 11:22:18 +0000 (06:22 -0500)]
; Auto-commit of loaddefs files.

8 years agoFix Bug#20821
Michael Albinus [Mon, 1 Feb 2016 10:48:43 +0000 (11:48 +0100)]
Fix Bug#20821

* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-handle-expand-file-name):
Use `tramp-drop-volume-letter'.  (Bug#20821)

8 years agoAdd ability to give rcirc servers an alias name
Dave Barker [Sat, 7 Nov 2015 22:32:51 +0000 (22:32 +0000)]
Add ability to give rcirc servers an alias name

* lisp/net/rcirc.el (rcirc-server-alist): Add :server-alias
customization option.
(rcirc, rcirc-connect): Take server alias into account.

8 years ago; Fix ChangeLog.2 commit ID.
Paul Eggert [Sun, 31 Jan 2016 20:37:11 +0000 (12:37 -0800)]
; Fix ChangeLog.2 commit ID.

8 years agoPort new hybrid malloc to FreeBSD
Paul Eggert [Sun, 31 Jan 2016 17:50:07 +0000 (09:50 -0800)]
Port new hybrid malloc to FreeBSD

Problem reported by Wolfgang Jenkner in: http://bugs.gnu.org/22086#118
* src/gmalloc.c (__malloc_initialize_hook, __after_morecore_hook)
(__morecore) [HYBRID_MALLOC]: Define in this case too.

8 years ago* configure.ac: Stop using mmap for buffers for FreeBSD.
Wolfgang Jenkner [Sun, 31 Jan 2016 17:23:06 +0000 (09:23 -0800)]
* configure.ac: Stop using mmap for buffers for FreeBSD.

8 years agoMerge changes from Tramp repository
Michael Albinus [Sun, 31 Jan 2016 12:50:23 +0000 (13:50 +0100)]
Merge changes from Tramp repository

* doc/misc/Makefile.in (${buildinfodir}/tramp.info tramp.html):
No EXTRA_OPTS needed.

* doc/misc/tramp.texi: Merge changes from Emacsemacs-25
branch, especially for @trampfn{}.
(Top): Move @ifnottex down.
(History): XEmacs support has been removed.
(GVFS based methods, Remote processes): Do not use emacsgvfs flag.
(Auto-save and Backup): Use both syntax versions.
(File name Syntax): Remark on IPv6 adresses is valid for
unified syntax only.

* doc/misc/trampver.texi: Do not set emacsgvfs flag.

8 years agoSpelling fixes
Paul Eggert [Sun, 31 Jan 2016 04:17:56 +0000 (20:17 -0800)]
Spelling fixes

8 years ago* lisp/vc/add-log.el (find-change-log): Use locate-dominating-file.
Glenn Morris [Sun, 31 Jan 2016 03:37:12 +0000 (19:37 -0800)]
* lisp/vc/add-log.el (find-change-log): Use locate-dominating-file.

8 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Matthew Carter [Sun, 31 Jan 2016 03:09:28 +0000 (22:09 -0500)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

8 years agoQuote table names for postgres listings (sql-mode)
Matthew Carter [Sun, 31 Jan 2016 03:03:57 +0000 (22:03 -0500)]
Quote table names for postgres listings (sql-mode)

* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
  unquoted table names to the completion list.

8 years agoChange Smerge "Mine" and "Other" for "Upper" and "Lower. (Bug#20878)
Glenn Morris [Sun, 31 Jan 2016 03:01:57 +0000 (19:01 -0800)]
Change Smerge "Mine" and "Other" for "Upper" and "Lower.  (Bug#20878)

* lisp/vc/smerge-mode.el (smerge-diff-switches)
(smerge-context-menu, smerge-match-conflict, smerge-swap): Doc fixes.
(smerge-upper, smerge-upper-face, smerge-keep-upper)
(smerge-diff-base-upper): Rename from smerge-mine, smerge-mine-face,
smerge-keep-mine, smerge-diff-base-mine.  Update all uses.
(smerge-mine-face, smerge-other-face): Remove obsolete face aliases.
(smerge-lower, smerge-lower-face, smerge-lower-re, smerge-keep-lower)
(smerge-diff-base-lower): Rename from smerge-other, smerge-other-face,
smerge-other-re, smerge-keep-other, smerge-diff-base-lower.
Update all uses.
(smerge-basic-map): Add "l" and "u" bindings.
(smerge-mode-menu): Update menu bindings for renaming.
(smerge-font-lock-keywords): Update face names.
(smerge-match-names): Update names.
(smerge-diff-upper-lower): Rename from smerge-diff-mine-other.
(smerge-match-conflict, smerge-ediff): Rename local variables.
(smerge-makeup-conflict): Relabel markers.
(smerge-parsep-re): Use renamed variables.

8 years agoPort recent my_edata change to MS-Windows
Paul Eggert [Sun, 31 Jan 2016 02:59:49 +0000 (18:59 -0800)]
Port recent my_edata change to MS-Windows

* src/lastfile.c (my_edata): Also define if WINDOWSNT.

8 years agoTell Automake the new lib/Makefile.am is OK
Paul Eggert [Sat, 30 Jan 2016 23:19:16 +0000 (15:19 -0800)]
Tell Automake the new lib/Makefile.am is OK

* lib/Makefile.am (AUTOMAKE_OPTIONS): Add -Wno-portability.

8 years agoMake it easy to override preferred-branch test
Paul Eggert [Sat, 30 Jan 2016 23:18:00 +0000 (15:18 -0800)]
Make it easy to override preferred-branch test

* Makefile.in (preferred-branch-is-current):
Rename from emacs-25-branch-is-current.  All uses changed.
(PREFERRED_BRANCH): New macro.

8 years ago; Try to clean up ChangeLog.2 mess created by merge.
Paul Eggert [Sat, 30 Jan 2016 22:45:53 +0000 (14:45 -0800)]
; Try to clean up ChangeLog.2 mess created by merge.

8 years agoShrink static heap a bit
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
Shrink static heap a bit

* src/sheap.h: Include lisp.h, for Lisp_Object.
(STATIC_HEAP_SIZE): Now an enum constant, not a macro.
Make it 2 MiB * sizeof (Lisp_Object), which is a bit more
conservative than the old value.
(Bug#22086)

8 years agoFix extern symbols defined and not used
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
Fix extern symbols defined and not used

* src/alloc.c: Always include <signal.h>.
(malloc_warning) [!SIGDANGER && (SYSTEM_MALLOC || HYBRID_MALLOC)]:
Do not define; unused.
* src/emacs.c, src/lisp.h (might_dump) [!DOUG_LEA_MALLOC]: Now static.
* src/gmalloc.c (gdefault_morecore): Rename from __default_morecore,
to avoid collision with glibc.  Now static.  All uses changed.
* src/lastfile.c (my_edata): Define only if
((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC && !defined
WINDOWSNT) \ || defined CYGWIN || defined DARWIN_OS).
(Bug#22086)

8 years agoBuild lib/e-*.o only on platforms that need it
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
Build lib/e-*.o only on platforms that need it

* configure.ac (hybrid malloc): Simplify configuration.
(SHEAP_OBJ): Remove; no longer needed.
(HYBRID_MALLOC): New var. Subst it.
(HYBRID_MALLOC_LIB): New Automake conditional.
* lib/Makefile.am (noinst_LIBRARIES): Add libegnu.a only if
HYBRID_MALLOC_LIB.
(libegnu_a_CPPFLAGS): Omit AM_CPPFLAGS; not needed.
(MOSTLYCLEANFILES): Add libegnu.a.
* src/Makefile.in (SHEAP_OBJ): Remove.
(HYBRID_MALLOC): New macro.
(base_obj): Use it to conditionally add sheap.o.
(LIBEGNU_ARCHIVE): New macro.
($(LIBEGNU_ARCHIVE)): New rule, replacing $(lib)/libegnu.a.
All uses of the latter replaced by the former.
* src/alloc.c (USE_ALIGNED_ALLOC): Simplify configuration.
Correct misspelling ALIGNED_ALLOC to HAVE_ALIGNED_ALLOC.
* src/gmalloc.c: Update comment.
* src/lisp.h (aligned_alloc)
[!DOUG_LEA_MALLOC && !HYBRID_MALLOC && !SYSTEM_MALLOC]:
New decl.
(Bug#22086)

8 years agoInclude <malloc.h> when advisable
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
Include <malloc.h> when advisable

This should help insulate us better from future glibc changes.
It is good hygiene to include .h files for APIs that Emacs uses.
Fix type clashes between Emacs and GNU <malloc.h> (Bug#22086).
* configure.ac: Check for malloc.h.
* src/alloc.c: Include <malloc.h> depending on HAVE_MALLOC_H,
not on DOUG_LEA_MALLOC.
* src/emacs.c, src/gmalloc.c (malloc_enable_thread):
Remove decl (now in lisp.h).
* src/gmalloc.c: Include stddef.h earlier, for ptrdiff_t.
[emacs]: Include lisp.h.
[HAVE_MALLOC_H]: Include <malloc.h>.
(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
(__after_morecore_hook, __malloc_initialize_hook, __morecore)
(__default_morecore):
[!HAVE_MALLOC_H]: New decls near non-inclusion of <malloc.h>.
(calloc): Make it clear that the macro should not be used.
Remove unused decl.
(malloc_info): New macro, to avoid clash with glibc <malloc.h>.
(__morecore, __default_morecore, __after_morecore_hook)
(__malloc_extra_blocks, __malloc_initialize_hook, __free_hook)
(__malloc_hook, __realloc_hook, __memalign_hook, memory_warnings):
Remove later decls.
(gmalloc_hook, gfree_hook, grealloc_hook):
Rename from __malloc_hook, __free_hook, __realloc_hook to
avoid type collision with glibc <malloc.h>.  All uses changed.
(gmalloc_hook):
(__malloc_extra_blocks) [DOUG_LEA_MALLOC||HYBRID_MALLOC||SYSTEM_MALLOC]:
Now static.
(gmalloc_hook, __malloc_extra_blocks): Define even if [!HYBRID_MALLOC].
(__malloc_initialize_hook, __after_morecore_hook):
Declare with types compatible with glibc.
(__memalign_hook, hybrid_calloc) [HYBRID_MALLOC]:
Remove.  All uses removed.
* src/lisp.h (__malloc_extra_blocks, malloc_enable_thread): New decls.
* src/ralloc.c, src/vm-limit.c:
Simplify includes and include <malloc.h> if available.

8 years ago* src/alloc.c: Include "sheap.h".
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
* src/alloc.c: Include "sheap.h".

(alloc_unexec_pre, alloc_unexec_post) [HYBRID_MALLOC]:
Set and clear bss_sbrk_did_unexec, on all platforms not just Cygwin.
* src/lisp.h (alloc_unexec_pre, alloc_unexec_post) [!DOUG_LEA_MALLOC]:
Declare unconditionally.
* src/unexcw.c, src/unexelf.c (bss_sbrk_did_unexec): Remove decl.
(unexec): Don’t set or clear bss_sbrk_did_unexec;
the caller now does this.
(Bug#22086)

8 years agoPacify --enable-gcc-warnings when HYBRID_MALLOC
Paul Eggert [Sat, 30 Jan 2016 22:20:57 +0000 (14:20 -0800)]
Pacify --enable-gcc-warnings when HYBRID_MALLOC

* src/buffer.c (init_buffer):
* src/emacs.c (main):
* src/xsmfns.c (smc_save_yourself_CB, x_session_initialize):
Use emacs_get_current_dir_name, not get_current_dir_name.
* src/conf_post.h (aligned_alloc) [HYBRID_MALLOC && emacs]: New macro.
(HYBRID_GET_CURRENT_DIR_NAME, get_current_dir_name): Remove.
* src/emacs.c: Include "sheap.h".
(report_sheap_usage): Remove decl.
(Fdump_emacs) [HYBRID_MALLOC]: Report usage directly.
Don't assume ptrdiff_t can be printed as int.
* src/gmalloc.c [HYBRID_MALLOC]:
Include "sheap.h" rather than declaring its contents by hand.
(get_current_dir_name, gget_current_dir_name)
(hybrid_get_current_dir_name): Remove.
(emacs_abort): Remove duplicate decl.
(aligned_alloc): Undef, like malloc etc.
(ALLOCATED_BEFORE_DUMPING): Now a static function, not a macro.
Make it a bit more efficient.
(malloc_find_object_address): Remove unused decl.
(enum mcheck_status, mcheck, mprobe, mtrace, muntrace, struct mstats)
(mstats, memory_warnings): Declare only if GC_MCHECK.
* src/lisp.h (emacs_get_current_dir_name):
New decl, replacing get_current_dir_name.
* src/sheap.c: Include sheap.h first.
(STATIC_HEAP_SIZE): Remove; now in sheap.h.
(debug_sheap): Now static.
(bss_sbrk_buffer_end): Remove; no longer used.
(bss_sbrk_ptr): Now static and private.
(bss_sbrk_did_unexec): Now bool.
(BLOCKSIZE): Remove, to avoid GCC warning about its not being used.
(bss_sbrk): Don't treat request_size 0 as special, since the code
works without this being a special case.
Avoid overflow if request size exceeds INT_MAX.
(report_sheap_usage): Remove; now done in emacs.c.
* src/sheap.h: New file.
* src/sysdep.c (get_current_dir_name): Remove macro.
Include "sheap.h".
(emacs_get_current_dir_name): Rename function from
get_current_dir_name.  Handle HYBRID_MALLOC here;
this is simpler.
(Bug#22086)

8 years agoReport static heap usage on non-Cygwin, too
Paul Eggert [Sat, 30 Jan 2016 22:20:56 +0000 (14:20 -0800)]
Report static heap usage on non-Cygwin, too

* src/emacs.c (Fdump_emacs) [HYBRID_MALLOC]: Report sheap usage here ...
* src/unexcw.c (unexec): ... instead of here, since sheap can be used
on platforms other than Cygwin (Bug#22086).

8 years agoPacify GCC on extern decls
Paul Eggert [Sat, 30 Jan 2016 22:20:56 +0000 (14:20 -0800)]
Pacify GCC on extern decls

* src/unexelf.c (bss_sbrk_did_unexec): Move decl to top level
to pacify recent GCC (Bug#22086).

8 years agoAdd musl patch to support HYBRID_MALLOC on elf systems
Wolfgang Jenkner [Sat, 30 Jan 2016 22:20:56 +0000 (14:20 -0800)]
Add musl patch to support HYBRID_MALLOC on elf systems

* src/gmalloc.c: Adjust for HYBRID_MALLOC in the non CYGWIN case.
(__default_morecore): Here, in particular.
* configure.ac: Define HYBRID_MALLOC when unexelf.o is used.
New variable SHEAP_OBJ.
* src/Makefile.in: Use it.
(Bug#22086)

8 years agounexelf.c hook to support HYBRID_MALLOC on ELF
Rich Felker [Sat, 30 Jan 2016 22:20:56 +0000 (14:20 -0800)]
unexelf.c hook to support HYBRID_MALLOC on ELF

* src/unexelf.c (unexec) [HYBRID_MALLOC]:
Define bss_sbrk_did_unexec (Bug#22086).
Copyright-paperwork-exempt: yes

8 years agoLink temacs with gnulib compiled with -Demacs
Wolfgang Jenkner [Sat, 30 Jan 2016 22:20:56 +0000 (14:20 -0800)]
Link temacs with gnulib compiled with -Demacs

This is done to support HYBRID_MALLOC, since some static variables
(e.g., last_environ in putenv.c) hold pointers to memory malloced
before dumping (Bug#22086).
* lib/Makefile.am: Add incantation to install libegnu.a.
* src/Makefile.in ($(lib)/libgnu.a): Replace with libegnu.a
(temacs$(EXEEXT)): Use it.

8 years agoInternal linkage for gmalloc etc. if HYBRID_MALLOC
Wolfgang Jenkner [Sat, 30 Jan 2016 22:20:55 +0000 (14:20 -0800)]
Internal linkage for gmalloc etc. if HYBRID_MALLOC

This avoids clashes with symbols if the after-dump malloc is
derived from Doug Lea's implementation (Bug#22086).

* src/gmalloc.c (emacs_abort, __morecore, __default_morecore):
Move declarations up.  For HYBRID_MALLOC, turn all `extern'
declarations below to `static' ones.
(aligned_alloc): Declare for !MSDOS as well.
(heapsize, _fraghead): Move resp. copy declaration downwards.
For HYBRID_MALLOC, conditionalize out the other definitions,
since the previous `static' declarations double as tentative
definitions, anyway.
(_malloc, _free, _realloc, __free_hook, _aligned_blocks)
(__realloc_hook, __memalign_hook): Conditionalize out.
(cfree, memalign, valloc): Ditto.

8 years ago; Update ChangeLog.2 commit by hand
Paul Eggert [Sat, 30 Jan 2016 22:08:35 +0000 (14:08 -0800)]
; Update ChangeLog.2 commit by hand

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 21:56:23 +0000 (13:56 -0800)]
; Merge from origin/emacs-25

The following commits were skipped:

7b14da4 Bump version to 25.0.90
6f607a9 ; Auto-commit of loaddefs files.

8 years ago-
Paul Eggert [Sat, 30 Jan 2016 21:56:23 +0000 (13:56 -0800)]
-

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:43:27 +0000 (11:43 -0800)]
; Merge from origin/emacs-25

The following commits were skipped:

ad879b7 Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
4a3db0f support rendering of wider range of combinging characters by ftfont backend

8 years ago-
Paul Eggert [Sat, 30 Jan 2016 19:43:26 +0000 (11:43 -0800)]
-

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:41:07 +0000 (11:41 -0800)]
; Merge from origin/emacs-25

The following commit was skipped:

fef1b30 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25

8 years ago-
Paul Eggert [Sat, 30 Jan 2016 19:41:07 +0000 (11:41 -0800)]
-

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)]
; Merge from origin/emacs-25

The following commit was skipped:

2aae081 ; Auto-commit of loaddefs files.

8 years agoMerge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)]
Merge from origin/emacs-25

3f481ad Rename xref-query-replace to xref-query-replace-in-results
62f4ed4 Update cl-defgeneric and cl-defmethod docstrings
2111e0e Comment out next-error-function integration in xref
4e11ad3 Correct a use of "which" in intro.texi
a1865bc Distinguish the two meanings of Java's keyword "default".  Fixes bug #22358.
76045f7 Don't operate on menu bar of nonexistent frame
c32f3bc Unbreak the GNUstep build.

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)]
; Merge from origin/emacs-25

The following commit was skipped:

371154b ; Auto-commit of loaddefs files.

8 years ago-
Paul Eggert [Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)]
-

8 years ago; Merge from origin/emacs-25
Paul Eggert [Sat, 30 Jan 2016 19:27:35 +0000 (11:27 -0800)]
; Merge from origin/emacs-25

The following commit was skipped:

7bf54d0 Backport kqueue integration from master

8 years ago-
Paul Eggert [Sat, 30 Jan 2016 19:27:34 +0000 (11:27 -0800)]
-

8 years agoBump version to 25.0.90 emacs-25.0.90
Nicolas Petton [Sat, 30 Jan 2016 13:43:12 +0000 (14:43 +0100)]
Bump version to 25.0.90

* README:
* configure.ac:
* msdos/sed2v2.inp: Bump version to 25.0.90.

8 years ago* etc/AUTHORS: Update the AUTHORS file
Nicolas Petton [Sat, 30 Jan 2016 13:40:17 +0000 (14:40 +0100)]
* etc/AUTHORS: Update the AUTHORS file

8 years ago; Auto-commit of loaddefs files.
Nicolas Petton [Sat, 30 Jan 2016 14:14:50 +0000 (15:14 +0100)]
; Auto-commit of loaddefs files.

* lisp/ldefs-boot.el: Update.

8 years ago; ChangeLog fixes
Nicolas Petton [Sat, 30 Jan 2016 13:39:23 +0000 (14:39 +0100)]
; ChangeLog fixes

* ChangeLog.2: Auto-update of the ChangeLog file, as well as entry
  fixes.

8 years agoauthors.el updates
Nicolas Petton [Sat, 30 Jan 2016 13:38:46 +0000 (14:38 +0100)]
authors.el updates

* admin/authors.el (authors-renamed-files-alist): Additions.

8 years agoMake it possible to run make change-history on emacs-25
Nicolas Petton [Sat, 30 Jan 2016 09:35:55 +0000 (10:35 +0100)]
Make it possible to run make change-history on emacs-25

* Makefile.in: Check if the current branch is emacs-25 instead of
  master.

8 years agoSupport Go language in 'etags'
lu4nx [Sat, 30 Jan 2016 12:56:43 +0000 (14:56 +0200)]
Support Go language in 'etags'

* lib-src/etags.c <Ruby_help>: Fix documentation of Ruby tags.
<Go_help>: New help.
<Go_suffixes>: New variable.
(Go_functions): New function.
<lang_names>: Add entry for Go.  (Bug#22370)

* doc/emacs/maintaining.texi (Tag Syntax): Document Go support.
* doc/man/etags.1: Mention Go support.

* etc/NEWS: Mention Go support.

* test/etags/go-src/test.go:
* test/etags/go-src/test1.go: New test files.
* test/etags/Makefile (GOSRC): New variable.
(SRCS): Add $(GOSRC).
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to addition of Go tests.

8 years agoImprove Ruby support in 'etags'
Eli Zaretskii [Sat, 30 Jan 2016 12:16:36 +0000 (14:16 +0200)]
Improve Ruby support in 'etags'

* lib-src/etags.c (Ruby_functions): Tag constants.  Don't tag
singleton classes.  Remove class qualifiers from tags generated
for method and constant names.  (Bug#22241)

* doc/emacs/maintaining.texi (Tag Syntax): Mention that constants
are tagged by etags in Ruby.

* etc/NEWS: Mention that constants are tagged by etags in Ruby.

* test/etags/ruby-src/test1.ruby: Add more tests.
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to the changes in etags and in Ruby
tests.

8 years agoAdjust etags test results to changes in copyright years
Eli Zaretskii [Sat, 30 Jan 2016 10:18:43 +0000 (12:18 +0200)]
Adjust etags test results to changes in copyright years

* test/etags/CTAGS.good:
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6: Adjust to shift in characters and
in line numbers.

8 years agoRe-enable checks in member, memql, delete to complain about non-lists
Andreas Schwab [Fri, 29 Jan 2016 10:18:42 +0000 (11:18 +0100)]
Re-enable checks in member, memql, delete to complain about non-lists

* fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change.

8 years agoRevert "Re-enable checks in member, memql, delete to complain about non-lists"
Andreas Schwab [Sat, 30 Jan 2016 09:39:20 +0000 (10:39 +0100)]
Revert "Re-enable checks in member, memql, delete to complain about non-lists"

This reverts commit f524e8b7f12d9b5a8b92084e5385429fe7b085b9.

8 years agoDon't fiddle with DEFAULT
Dmitry Gutov [Sat, 30 Jan 2016 08:55:19 +0000 (11:55 +0300)]
Don't fiddle with DEFAULT

* lisp/progmodes/project.el (project--completing-read-strict):
Don't change DEFAULT, whether is has any matches in
COLLECTION, or not.

8 years agoDocument xwidget commands and functions
Eli Zaretskii [Sat, 30 Jan 2016 08:04:13 +0000 (10:04 +0200)]
Document xwidget commands and functions

* doc/lispref/display.texi (Xwidgets): New section, describes some
of the xwidget primitives.
* doc/lispref/display.texi (Display): Update the chapter menu.
* doc/emacs/misc.texi (Embedded WebKit Widgets): New section.
* doc/emacs/emacs.texi (Top): Update the master menu to include
the xwidget node.

8 years agoBuild fix for shr.el
Lars Ingebrigtsen [Sat, 30 Jan 2016 07:54:17 +0000 (08:54 +0100)]
Build fix for shr.el

* shr.el (seq): Require.

8 years agoImprove project-find-file yet again!
Dmitry Gutov [Sat, 30 Jan 2016 04:21:31 +0000 (07:21 +0300)]
Improve project-find-file yet again!

* lisp/progmodes/project.el (project--completing-read-strict):
New function.
(project-find-file-in): Use it.
(project-file-completion-table): Move the default
implementation inside the cl-defgeneric form.
(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01720.html)

8 years agoDon't pass DIR to 'hg status'
Dmitry Gutov [Sat, 30 Jan 2016 03:55:32 +0000 (06:55 +0300)]
Don't pass DIR to 'hg status'

* lisp/vc/vc-hg.el (vc-hg-dir-status-files):
Don't pass DIR to 'hg status' (bug#22481).

8 years agoFix typo in previous commits
Stephen Leake [Fri, 29 Jan 2016 23:53:35 +0000 (17:53 -0600)]
Fix typo in previous commits

* lisp/progmodes/project.el (project-find-file-in):
* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
commit.

8 years agoImprove project-find-file
Stephen Leake [Fri, 29 Jan 2016 23:43:26 +0000 (17:43 -0600)]
Improve project-find-file

* lisp/progmodes/project.el (project-file-completion-table): New.
(project-find-file, project-or-external-find-file): Default to filename
at point.
(project-file-completion-table): New, split out from
project--find-file-in.
(project-find-file-in): Renamed from project--find-file-in, use
project-file-completion-table.

* lisp/progmodes/xref.el (ede-minor-mode): New declaration.
(xref--find-ignores-arguments): Add doc string.

8 years agoImplement vc-mtn-find-ignore-file, fix some doc strings
Stephen Leake [Wed, 27 Jan 2016 21:04:33 +0000 (15:04 -0600)]
Implement vc-mtn-find-ignore-file, fix some doc strings

* lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc string.

* lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.

* lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.

* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.

8 years agoCorrect a whole bunch of bugs coming with renamed cell relocation.
Vincent Belaïche [Fri, 29 Jan 2016 11:22:30 +0000 (12:22 +0100)]
Correct a whole bunch of bugs coming with renamed cell relocation.

This is the same change as commit on master branch. See
http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=badcd38aa86ed7973f2be2743c405710973a0bdd

* lisp/ses.el (ses-localvars): rename variable
`ses--renamed-cell-symb-list' into `ses--in-killing-named-cell-list'
and adjust the comment about it.
(ses-plist-delq): new defun.
(ses--ses-buffer-list): new defvar.
(ses--unbind-cell-name): new defun.
(ses-relocate-symbol): Do not relocate symbol when it is a named cell.
(ses-relocate-formula): Undo change of
2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net that was
preventing relocation for named cell --- now doing this is delegated
to function `ses-relocate-symbol'.
(ses-relocate-range): In docstring, undo change of
2016-01-03T07:31:52Z!johnw@newartisans.com, `ses-range' must remain
lower case as it is not a variable.
(ses-relocate-all): Cell name relocation : 1) check that cell is a
renamed cell by testing `ses-cell' property to :ses-named, rather than
comparing name to corresponding standard name. Set rowcol of renamed
cell into the hashmap --- `ses-cell' property must not be used for
that as the same name can be used for different locations in different
SES sheets ; 2) use `local-variable-if-set-p' rather than `boundp' and
`local-variable-p' to check if cell name is already in use in this
sheet or needs initialisation.
(ses-relocate-all): Cell value relocation : 1) like for name
relocation use the `ses-cell' property rather than comparing actual
name to corresponding standard name. 2) Correct bug introduced in
2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net, as the test was
made the other way round than the intention --- ie value relocation
was disabled for standard cell, not for renamed cell as was the
intention.
(ses-relocate-all): Add loop for unbinding deleted renamed cells
names.
(ses-killbuffer-hook): new defun.
(ses-mode): Add the ses--ses-buffer-list maintenance mechanism ---
kill buffer hook, plus pushing current buffer if new in list.
(ses-delete-row, ses-delete-column): Collect deleted renamed cells
into `ses--in-killing-named-cell-list'.
(ses-rename-cell): Remove update of variable
`ses--renamed-cell-symb-list', this variable is renamed to
`ses--in-killing-named-cell-list', and its setting is done in
functions `ses-delete-row' and , `ses-delete-column' now.
(ses-rename-cell): Make cell new name a buffer local variable.
(ses-rename-cell): Change correction of
2015-12-30T23:10:37Z!vincentb1@users.sourceforge.net concerning
computation of the range over which `cursor-intangible' property was
to be updated. This correction was ok for non spilling cells, but not
for cells spilling over following blank cells. Simply use
`next-single-property-change' rather than computing the end column
from column widths.

8 years agoRe-enable checks in member, memql, delete to complain about non-lists
Andreas Schwab [Fri, 29 Jan 2016 10:18:42 +0000 (11:18 +0100)]
Re-enable checks in member, memql, delete to complain about non-lists

* fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change.

8 years agoc:/emacs-git/next/ChangeLog
Martin Rudalics [Fri, 29 Jan 2016 10:14:13 +0000 (11:14 +0100)]
c:/emacs-git/next/ChangeLog

8 years agoMinor improvements to 'pcase' documentation
Eli Zaretskii [Fri, 29 Jan 2016 09:40:31 +0000 (11:40 +0200)]
Minor improvements to 'pcase' documentation

* doc/lispref/control.texi (Pattern matching case statement):
Improve the documentation of 'pcase' per comments.  See two
discussion threads on emacs-devel@gnu.org for the details:
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01335.html
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01336.html.

8 years agoRemove some useless-use-of eval.
Glenn Morris [Fri, 29 Jan 2016 02:16:12 +0000 (21:16 -0500)]
Remove some useless-use-of eval.

* lisp/gnus/gnus.el (gnus-load-hook): Don't use eval.
* lisp/gnus/nnrss.el (xml): Simply require it.
(xml-rpc-method-call): Use declare-function.

8 years ago; * lisp/textmodes/table.el: Comment tweak.
Glenn Morris [Fri, 29 Jan 2016 02:11:55 +0000 (21:11 -0500)]
; * lisp/textmodes/table.el: Comment tweak.

8 years agoDon't use eval to quieten prolog.el compilation.
Glenn Morris [Fri, 29 Jan 2016 02:04:20 +0000 (21:04 -0500)]
Don't use eval to quieten prolog.el compilation.

* lisp/progmodes/prolog.el (pltrace-on, pltrace-off): Declare.
(prolog-enable-sicstus-sd, prolog-disable-sicstus-sd): Don't use eval.

8 years agoMark some risky prolog variables.
Glenn Morris [Fri, 29 Jan 2016 02:01:17 +0000 (21:01 -0500)]
Mark some risky prolog variables.

* lisp/progmodes/prolog.el (prolog-system-version)
(prolog-keywords, prolog-types, prolog-mode-specificators)
(prolog-determinism-specificators, prolog-directives)
(prolog-program-name, prolog-program-switches)
(prolog-consult-string, prolog-compile-string)
(prolog-eof-string, prolog-prompt-regexp, prolog-help-function):
Mark anything processed by prolog-find-value-by-system as risky.

8 years ago* lisp/custom.el (defcustom): Doc fix.
Glenn Morris [Thu, 28 Jan 2016 22:45:50 +0000 (17:45 -0500)]
* lisp/custom.el (defcustom): Doc fix.

* doc/lispref/customize.texi (Variable Definitions):
Defcustom should always have a type.

8 years ago* lisp/emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
Glenn Morris [Thu, 28 Jan 2016 22:16:51 +0000 (17:16 -0500)]
* lisp/emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
Warn if defcustom has no type.  (Bug#16276)

8 years ago* lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
Glenn Morris [Thu, 28 Jan 2016 22:13:38 +0000 (17:13 -0500)]
* lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
Fix :type.

8 years ago* lisp/emacs-lisp/package.el (package-load-list): Improve :type.
Glenn Morris [Thu, 28 Jan 2016 16:58:43 +0000 (08:58 -0800)]
* lisp/emacs-lisp/package.el (package-load-list): Improve :type.

8 years agoFix Bug#22452
Michael Albinus [Thu, 28 Jan 2016 12:37:58 +0000 (13:37 +0100)]
Fix Bug#22452

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
Mark it as connected.

* lisp/net/tramp.el (tramp-handle-file-remote-p): Check also, if
connection property "connected" is set.  (Bug#22452)

8 years ago* test/lisp/vc/vc-hg.el: Move from test/automated/.
Glenn Morris [Thu, 28 Jan 2016 01:32:45 +0000 (20:32 -0500)]
* test/lisp/vc/vc-hg.el: Move from test/automated/.

; Changed directory structures across branches - the gift that keeps on giving.

8 years ago* lisp/xwidget.el (xwidget-query-on-exit-flag): Declare.
Glenn Morris [Wed, 27 Jan 2016 22:06:08 +0000 (17:06 -0500)]
* lisp/xwidget.el (xwidget-query-on-exit-flag): Declare.

8 years ago* lisp/xwidget.el (xwidget-webkit-browse-url): Give explicit error
Glenn Morris [Wed, 27 Jan 2016 22:01:30 +0000 (17:01 -0500)]
* lisp/xwidget.el (xwidget-webkit-browse-url): Give explicit error
if not compiled with xwidgets.

8 years agoC-u C-x = example doc fix
Paul Eggert [Wed, 27 Jan 2016 07:24:27 +0000 (23:24 -0800)]
C-u C-x = example doc fix

* doc/emacs/mule.texi (International Chars):
Adjust example to match current behavior of C-u C-x =.

8 years agomalloc.h hygiene
Paul Eggert [Wed, 27 Jan 2016 07:00:10 +0000 (23:00 -0800)]
malloc.h hygiene

This attempts to future-proof Emacs a bit against possible glibc
changes, by having Emacs use <malloc.h> declarations rather than
coding them up by hand.  Problem noted by Florian Weimer in:
https://sourceware.org/ml/libc-alpha/2016-01/msg00777.html
Implement this mainly by moving malloc.h-related functions from
emacs.c (which does not include <malloc.h>) to alloc.c (which does).
* src/alloc.c (my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]:
New function.
The remaining changes to this file apply only if DOUG_LEA_MALLOC.
(alloc_unexec_pre, alloc_unexec_post): New functions.
(malloc_initialize_hook): Use my_heap_start and alloc_unexec_post.
(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
(__malloc_initialize_hook): Use it.
(malloc_state_ptr, malloc_initialize_hook, __malloc_initialize_hook):
Move here from ...
* src/emacs.c: ... here.
(malloc_get_state, malloc_set_state): Remove extern decls.
(my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]: Remove static var.
All uses changed to similarly-named new function.
(Fdump_emacs): Use new functions alloc_unexec_pre, alloc_unexec_post.
* src/lisp.h (my_heap_start, alloc_unexec_pre, alloc_unexec_post):
New decls.

8 years ago; Fix a typo in the user manual
Eli Zaretskii [Tue, 26 Jan 2016 18:31:10 +0000 (20:31 +0200)]
; Fix a typo in the user manual

* doc/emacs/anti.texi (Antinews): Fix typo.  Reported by Lele
Gaifax <lele@metapensiero.it>.

8 years ago* doc/emacs/mark.texi (Using Region): Clarify wording. (Bug#22467)
Eli Zaretskii [Tue, 26 Jan 2016 18:26:54 +0000 (20:26 +0200)]
* doc/emacs/mark.texi (Using Region): Clarify wording.  (Bug#22467)

8 years agoRemove never-set var handle_user_signal_hook
Paul Eggert [Tue, 26 Jan 2016 15:41:41 +0000 (07:41 -0800)]
Remove never-set var handle_user_signal_hook

* src/keyboard.c, src/keyboard.h (handle_user_signal_hook):
Remove never-set var.  All uses removed.

8 years agoBackport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
K. Handa [Thu, 14 Jan 2016 12:48:44 +0000 (21:48 +0900)]
Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)

* src/ftfont.c (ftfont_shape_by_flt): Fix previous change.  Access the
second glyph only when there are enough glyphs.

(cherry picked from commit 9835757013569673854b692ccbb58bfb3c3ed1f7)

8 years agosupport rendering of wider range of combinging characters by ftfont backend
K. Handa [Sat, 2 Jan 2016 07:36:21 +0000 (16:36 +0900)]
support rendering of wider range of combinging characters by ftfont backend

* lisp/language/hebrew.el (hebrew-shape-gstring): If the font backend
supports rendering of combining characters, call
font-shape-gstring.

* src/font.c (Ffont_get): Handle `combining-capability' property.
(syms_of_font): New symbol ":combining-capability'.

* src/font.h (struct font_driver): New member combining_capability.

* src/ftfont.c: Include "category.h".
(ftfont_driver): Initialize combining_capability to
ftfont_combining_capability.
(ftfont_shape_by_flt): If OTF is null, try to find a suitable
FLT in advance.
(ftfont_combining_capability): New function.

(cherry picked from commit 536f48e9a2251b9e654ea974bd90ff2f40218753)

8 years agoFixed NextStep fullscreen issue (bug#22468)
Anders Lindgren [Tue, 26 Jan 2016 12:51:59 +0000 (13:51 +0100)]
Fixed NextStep fullscreen issue (bug#22468)

When in fullscreen mode, `[screen visibleFrame]' sometimes
includes, sometimes excludes the menu bar. This could cause
a frame to be placed too low when in fullscreen mode.

* src/nsterm.m (ns_menu_bar_should_be_hidden): Trace.
(constrain_frame_rect): New parameter, isFullscreen, when true don't
query the height of the menu bar.
(ns_constrain_all_frames): Pass `false' (isFullscreen) to
`constrain_frame_rect'.
([EmacsView initFrameFromEmacs:]): Trace.
([EmacsView isFullscreen]): Trace.
([EmacsWindow constrainFrameRect:toScreen:]): Pass fullscreen
state to `constrain_frame_rect'.

8 years ago* lisp/files.el: Use a fixed file name for the second dir-locals file
Artur Malabarba [Mon, 25 Jan 2016 22:42:50 +0000 (22:42 +0000)]
* lisp/files.el: Use a fixed file name for the second dir-locals file

(dir-locals-file): Revert to its original fixed value.
(dir-locals-file-2): New const.
(dir-locals--all-files): Don't use `file-name-all-completions'.
Instead, just check for the 2 dir-locals files and return a list
of the ones that exit (if any).

* etc/NEWS: Document the change.

* doc/emacs/custom.texi (Directory Variables): Document the change.

* doc/lispref/variables.texi (Directory Local Variables): Update
accordingly.

8 years ago* lisp/files-x.el (modify-dir-local-variable): Small rewrite
Artur Malabarba [Mon, 25 Jan 2016 16:56:08 +0000 (16:56 +0000)]
* lisp/files-x.el (modify-dir-local-variable): Small rewrite

Change a variable name to be more meaningful, and reorder some of
the code with no change in behaviour.

8 years ago* lisp/files.el (dir-locals-find-file): Refactor return values
Artur Malabarba [Mon, 25 Jan 2016 16:54:08 +0000 (16:54 +0000)]
* lisp/files.el (dir-locals-find-file): Refactor return values

Returning a cache remains unchanged, but the case of returning a
file (or pattern) is now changed to return the contaning
directory.

(dir-locals-read-from-file): Rename to `dir-locals-read-from-dir'
and make obsolete.
(dir-locals-read-from-dir): Simplify accordingly.
(hack-dir-local-variables): Simplify accordingly and rename a
variable.

8 years ago* lisp/textmodes/flyspell.el (flyspell--prev-meta-tab-binding):
Glenn Morris [Mon, 25 Jan 2016 23:31:04 +0000 (18:31 -0500)]
* lisp/textmodes/flyspell.el (flyspell--prev-meta-tab-binding):
Declare.