1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Commit Graph

118859 Commits

Author SHA1 Message Date
Paul Eggert
035f5aaa91 Merge from gnulib, incorporating:
2015-01-01 version-etc: new year
2015-01-01 11:06:53 -08:00
Paul Eggert
6ddd819467 Merge from origin/emacs-24
a5f90a3 * .gitattributes: New file.
5a9710f Make sure tool-bar changes are reflected on display.
93796ba * autogen.sh: Port better to non-GNU 'cp'.
9758516 Fix a typo in a comment in the previous commit.
aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p.  (Bug#19473)
d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out.
9278f05 Omit trailing white space
1c93fd3 Sync with Tramp 2.2.11.
96ebe18 Sync with Tramp 2.2.11.
e792450 Sync with Tramp 2.2.11.
2d17e12 Fix ChangeLog entry.
6444482 Fix auto-revert-tail-mode for remote files
b5c9c13 Spelling fixes
c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix.  (Bug#19458)

Conflicts:
	ChangeLog
	doc/misc/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog
2015-01-01 10:47:17 -08:00
Paul Eggert
a5f90a3762 * .gitattributes: New file. 2015-01-01 09:17:57 -08:00
Simen Heggestøyl
935fa6151b * lisp/textmodes/css-mode.el (scss-mode): Fix typo.
Fixes: debbugs:19446
2015-01-01 11:19:02 -05:00
Eli Zaretskii
5a9710f6e6 Make sure tool-bar changes are reflected on display.
lisp/tool-bar.el (tool-bar-local-item)
 (tool-bar-local-item-from-menu): Call force-mode-line-update to
 make sure the tool-bar changes show on display.
2015-01-01 17:29:51 +02:00
Glenn Morris
17263d5184 Auto-commit of loaddefs files. 2015-01-01 06:17:46 -05:00
Paul Eggert
7e3507cfc4 Less 'make' chatter for doc and lisp
[doc/emacs/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/emacs.info, emacs.html):
Use them.
[doc/lispintro/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html):
Use them.
[doc/lispref/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/elisp.info, elisp.html):
Use them.
[doc/misc/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info)
(${buildinfodir}/efaq%.info, efaq%.html):
Use them.
[lisp/ChangeLog]
Less 'make' chatter in lisp directory
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in.
(custom-deps, finder-data, autoloads, update-subdirs): Use them.
2014-12-31 11:59:41 -08:00
Paul Eggert
5d6b37084b Less 'make' chatter at top level
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
(am__v_at_1): New macros, copied from src/Makefile.in.
($(srcdir)/src/config.in, ${srcdir}/info/dir):
Be less chatty when not verbose.
($(srcdir)/src/stamp-h.in): Simplify with '$@'.
2014-12-31 07:48:08 -08:00
Paul Eggert
93796baeee * autogen.sh: Port better to non-GNU 'cp'.
Problem reported by Han Boetes.
2014-12-31 07:15:43 -08:00
Filipp Gunbin
f588156cbc Use prefix argument in `info-display-manual'
* lisp/info.el (info-display-manual): Limit the completion alternatives
to currently visited manuals if prefix argument is non-nil.
2014-12-31 17:15:36 +03:00
Paul Eggert
25346768fa Simplify setfattr use by assuming GNU make
* Makefile.in (PAXCTL_if_present, SETFATTR_if_present): New macros.
(emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)): Use them.
Simplify by using GNU make rather than shell conditionals,
by using ln -f rather than rm -f followed by ln,
and by preferring $@ to spelling out the destination.
2014-12-30 23:50:55 -08:00
Paul Eggert
6654a4ce49 * Makefile.in (semantic): Simplify. 2014-12-30 23:50:54 -08:00
Juri Linkov
5480b8ef25 Multi-page isearch support in eww
* lisp/net/eww.el (eww-isearch-next-buffer): New function.
(eww-mode): Set multi-isearch-next-buffer-function to it.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02300.html
2014-12-31 01:50:06 +02:00
Dmitry Gutov
0d7f85fbca (xref-find-definitions): Mention "no identifier at point" case
* lisp/progmodes/xref.el (xref-find-definitions): Mention "no
identifier at point" case in the docstring.
2014-12-30 21:54:03 +02:00
Eli Zaretskii
9758516441 Fix a typo in a comment in the previous commit. 2014-12-30 21:51:34 +02:00
Eli Zaretskii
aa472a3771 Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473)
src/xdisp.c (pos_visible_p): Fix up the X coordinate for
 right-to-left screen lines.
2014-12-30 19:29:24 +02:00
Michael Albinus
d2612290f9 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p):
New defun.
(tramp-test30-special-characters): Use it.
(tramp--test-check-files): Filter nil file names out.
2014-12-30 12:45:48 +01:00
Martin Rudalics
01827de451 Update documentation of Temporary Displays.
* display.texi (Temporary Displays): Amend description of
`with-temp-buffer-window'.  Add descriptions for
`with-current-buffer-window', `with-displayed-buffer-window' and
`temp-buffer-resize-mode', `temp-buffer-max-height' and
`temp-buffer-max-width'.

* frame.c (frame_inhibit_implied_resize): Escape left paren in
doc-string.
2014-12-30 10:56:43 +01:00
Paul Eggert
9278f05860 Omit trailing white space
This should simplify switching to automated ChangeLogs.
2014-12-29 22:39:35 -08:00
Paul Eggert
ec98420dbc * PROBLEMS: Omit obsolete mention of FQDNs. 2014-12-29 20:42:56 -08:00
Dmitry Gutov
21f9a9513a Hide "Set Tags File Name" and the separator when tags are not used
* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): New function.
(menu-bar-goto-menu): Use it to show or hide the `set-tags-name'
and `separator-tag-file' items.
2014-12-30 05:18:48 +02:00
Eli Zaretskii
8ae52a7703 Fix the MS-Windows build.
src/sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
 file doesn't compile on MS-Windows.
2014-12-29 23:02:22 +02:00
Paul Eggert
a5e5d7773b * obsolete/pc-select.el (pc-selection-mode): Use system-type.
This is instead of system-name, which is both wrong here and obsolete.
2014-12-29 12:45:47 -08:00
Paul Eggert
973110680c Fix previous patch to match its commit message 2014-12-29 12:42:07 -08:00
Paul Eggert
f9acac751d system-name's returned value can vary
Also, the system-name variable is now obsolete.
Fixes Bug#19438.
* doc/lispref/os.texi (System Environment):
* etc/NEWS: Document this.
* doc/misc/efaq.texi:
(Displaying the current file name in the titlebar):
* lisp/desktop.el (desktop-save-frameset):
* lisp/dnd.el (dnd-get-local-file-uri):
* lisp/gnus/message.el (message-make-fqdn):
* lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers)
(nnvirtual-update-xref-header):
* lisp/nxml/rng-uri.el (rng-uri-file-name-1):
* lisp/org/org-clock.el (org-clock-save):
* src/filelock.c (current_lock_owner):
* src/xrdb.c (get_environ_db):
* src/xterm.c (same_x_server):
* src/xterm.c (x_term_init):
Prefer (system-name) to system-name, and avoid naming
locals 'system-name'.
* doc/misc/smtpmail.texi (Server workarounds): Fix grammar.
* lisp/startup.el (system-name): Now an obsolete variable.
* src/editfns.c (cached_system_name): New static var.
(init_and_cache_system_name): New function.
(init_editfns, Fsystem_name): Use it.
(syms_of_editfns): Initialize it and Vsystem_name to the same value.
* src/sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
(h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
(init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
Don't create a new string if the current value is already correct.
2014-12-29 12:38:58 -08:00
Michael Albinus
1c93fd3854 Sync with Tramp 2.2.11.
* trampver.texi: Update release number.
2014-12-29 17:37:37 +01:00
Michael Albinus
96ebe180f2 Sync with Tramp 2.2.11.
* automated/tramp-tests.el (tramp-test30-special-characters):
Skip test on MS-Windows.
2014-12-29 17:35:09 +01:00
Michael Albinus
e792450d4b Sync with Tramp 2.2.11.
* net/tramp-compat.el (top): Require cl-macs for Emacs 22.
Make an alias for `default-toplevel-value' if it doesn't exist.

* net/tramp-smb.el (tramp-smb-handle-copy-directory):
Use `tramp-compat-delete-directory'.

* net/trampver.el: Update release number.
2014-12-29 17:31:15 +01:00
Michael Albinus
2d17e122a1 Fix ChangeLog entry. 2014-12-29 16:27:09 +01:00
Dmitry Gutov
ce1ebdf1ba Update ChangeLog for the latest menu-bar.el change 2014-12-29 17:04:51 +02:00
Filipp Gunbin
6444482c63 Fix auto-revert-tail-mode for remote files
Fixes: debbugs:19449

* autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for
  remote files (bug#19449)
2014-12-29 17:35:51 +03:00
K. Handa
bb5e786159 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs. 2014-12-29 22:54:07 +09:00
K. Handa
3fa5f4416e international/mule.el (make-translation-table-from-alist): Accept nil or zero-length vector for FROM and TO. 2014-12-29 22:39:38 +09:00
Lars Ingebrigtsen
8e0b2702ce lisp/gnus/gnus-cloud.el: Start collecting a newsrc 2014-12-29 13:04:25 +00:00
Lars Ingebrigtsen
c5a81fdb6f Make eww rendering default to `window-width' again
* lisp/gnus/mm-decode.el (mm-shr): Bind `shr-width' to `fill-column'
so that lines don't get overlong when responding.

* lisp/net/eww.el (eww-mode): Truncate overlong lines for prettier
display when resizing.

* lisp/net/shr.el (shr-width): Default to using the window width when
rendering.
2014-12-29 13:48:43 +01:00
Ulrich Müller
d7e858bcc6 CONTRIBUTE: Use consistent spelling for 'ChangeLog'. 2014-12-29 11:20:50 +01:00
Dmitry Gutov
381c0bfaf2 Unbreak jumping to an alias's definition
* lisp/emacs-lisp/find-func.el (find-function-library): Return a pair
(ORIG-FUNCTION . LIBRARY) instead of just its second element.
(find-function-noselect): Use it.

* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-file): Rename to
`elisp--xref-identifier-location', incorporate logic from
`elisp--xref-find-definitions', use the changed
`find-function-library' return value.
2014-12-29 04:21:51 +02:00
Juri Linkov
ceed9dd191 Small fixes in etc/grep.txt 2014-12-29 02:54:41 +02:00
Juri Linkov
a0ae3d7331 More fixes to support multi-line search in comint
* lisp/comint.el (comint-history-isearch-message): Use field-beginning
instead of comint-line-beginning-position - that's more fixes for
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
(comint-history-isearch-message): Fix args of isearch-message-prefix.
2014-12-29 02:52:38 +02:00
Juri Linkov
df0f2a5f3b * lisp/vc/vc-dir.el (vc-dir-display-file): New command.
(vc-dir-mode-map): Bind it to "\C-o".
(vc-dir-menu-map): Add it to menu.

Fixes: debbugs:19450
2014-12-29 02:47:05 +02:00
Dmitry Gutov
c1eec81485 Declare many etags command obsolete; update the goto menu
* lisp/menu-bar.el (menu-bar-goto-menu): Replace all but one etags item
with xref ones.

* lisp/progmodes/etags.el (find-tag-other-window)
(find-tag-other-frame, find-tag-regexp, tags-loop-continue)
(tags-apropos): Declare obsolete.
2014-12-29 02:36:57 +02:00
Paul Eggert
b5c9c131ca Spelling fixes 2014-12-28 15:06:16 -08:00
Eli Zaretskii
c5504d1005 src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) 2014-12-28 20:32:53 +02:00
Paul Eggert
9fb9136398 Merge from origin/emacs-24
f646cd9 * build-aux/git-hooks/commit-msg: Allow tabs.
2014-12-28 10:17:48 -08:00
Paul Eggert
c12598a62e Merge from origin/emacs-24
The following commits were skipped:

39eaef9 lisp/international/mule.el (define-coding-system): Fix typos in the doc string. Add missing ChangeLog entry for the previous commit.
df932d8 lisp/international/mule.el (define-coding-system): Improve docstring.
2014-12-28 10:14:19 -08:00
Paul Eggert
f646cd99e5 * build-aux/git-hooks/commit-msg: Allow tabs.
Treat them as if they were expanded to spaces, with tab stops
every 8 columns.
2014-12-28 10:07:56 -08:00
Paul Eggert
20791069fa Fix produce_composite_width typo
* term.c (produce_composite_glyph):
Fix typo that confused number of columns for pixel width.
2014-12-28 09:00:41 -08:00
Eli Zaretskii
39eaef9f8b lisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Add missing ChangeLog entry for the previous commit.

Backported from trunk; do not merge back.

(cherry picked from commit 79e2dade76)
2014-12-28 17:51:45 +02:00
Kenichi Handa
df932d8591 lisp/international/mule.el (define-coding-system): Improve docstring.
Backported from trunk; do not merge back.

(cherry picked from commit 5979af512b)
2014-12-28 17:50:07 +02:00
Eli Zaretskii
79e2dade76 lisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Add missing ChangeLog entry for the previous commit.
2014-12-28 17:43:43 +02:00