]> git.eshelyaron.com Git - emacs.git/log
emacs.git
9 years agoreverting some spurious changes
jave [Wed, 31 Dec 2014 17:25:30 +0000 (18:25 +0100)]
reverting some spurious changes

9 years agoreverted mysterious spuriouschange in otodo-mode
jave [Wed, 31 Dec 2014 16:34:44 +0000 (17:34 +0100)]
reverted mysterious spuriouschange in otodo-mode

9 years agosrc/macuvs.h.moved showed up, and I removed it.
jave [Wed, 31 Dec 2014 11:58:09 +0000 (12:58 +0100)]
src/macuvs.h.moved showed up, and I removed it.

Its all very odd.

9 years agomerge upstream
jave [Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)]
merge upstream

9 years agoSimplify setfattr use by assuming GNU make
Paul Eggert [Wed, 31 Dec 2014 07:29:33 +0000 (23:29 -0800)]
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.

9 years ago* Makefile.in (semantic): Simplify.
Paul Eggert [Wed, 31 Dec 2014 00:00:03 +0000 (16:00 -0800)]
* Makefile.in (semantic): Simplify.

9 years agoMulti-page isearch support in eww
Juri Linkov [Tue, 30 Dec 2014 23:50:06 +0000 (01:50 +0200)]
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

9 years ago(xref-find-definitions): Mention "no identifier at point" case
Dmitry Gutov [Tue, 30 Dec 2014 19:54:03 +0000 (21:54 +0200)]
(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.

9 years agoImproved configury
jave [Tue, 30 Dec 2014 17:49:48 +0000 (18:49 +0100)]
Improved configury

Check several conditions before trying to enable xwidgets.

9 years agoreplaced docs with external link
jave [Tue, 30 Dec 2014 15:20:29 +0000 (16:20 +0100)]
replaced docs with external link

9 years agoUpdate documentation of Temporary Displays.
Martin Rudalics [Tue, 30 Dec 2014 09:56:43 +0000 (10:56 +0100)]
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.

9 years ago* PROBLEMS: Omit obsolete mention of FQDNs.
Paul Eggert [Tue, 30 Dec 2014 04:42:26 +0000 (20:42 -0800)]
* PROBLEMS: Omit obsolete mention of FQDNs.

9 years agoHide "Set Tags File Name" and the separator when tags are not used
Dmitry Gutov [Tue, 30 Dec 2014 03:18:48 +0000 (05:18 +0200)]
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.

9 years agoFix the MS-Windows build.
Eli Zaretskii [Mon, 29 Dec 2014 21:02:22 +0000 (23:02 +0200)]
Fix the MS-Windows build.

 src/sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
 file doesn't compile on MS-Windows.

9 years ago* obsolete/pc-select.el (pc-selection-mode): Use system-type.
Paul Eggert [Mon, 29 Dec 2014 20:45:25 +0000 (12:45 -0800)]
* obsolete/pc-select.el (pc-selection-mode): Use system-type.

This is instead of system-name, which is both wrong here and obsolete.

9 years agoFix previous patch to match its commit message
Paul Eggert [Mon, 29 Dec 2014 20:39:58 +0000 (12:39 -0800)]
Fix previous patch to match its commit message

9 years agosystem-name's returned value can vary
Paul Eggert [Mon, 29 Dec 2014 20:37:53 +0000 (12:37 -0800)]
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.

9 years agoUpdate ChangeLog for the latest menu-bar.el change
Dmitry Gutov [Mon, 29 Dec 2014 15:04:51 +0000 (17:04 +0200)]
Update ChangeLog for the latest menu-bar.el change

9 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs.
K. Handa [Mon, 29 Dec 2014 13:54:07 +0000 (22:54 +0900)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs.

9 years agointernational/mule.el (make-translation-table-from-alist): Accept nil or zero-length...
K. Handa [Mon, 29 Dec 2014 13:39:38 +0000 (22:39 +0900)]
international/mule.el (make-translation-table-from-alist): Accept nil or zero-length vector for FROM and TO.

9 years agolisp/gnus/gnus-cloud.el: Start collecting a newsrc
Lars Ingebrigtsen [Mon, 29 Dec 2014 13:04:25 +0000 (13:04 +0000)]
lisp/gnus/gnus-cloud.el: Start collecting a newsrc

9 years agoMake eww rendering default to `window-width' again
Lars Ingebrigtsen [Mon, 29 Dec 2014 12:47:43 +0000 (13:47 +0100)]
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.

9 years agoCONTRIBUTE: Use consistent spelling for 'ChangeLog'.
Ulrich Müller [Mon, 29 Dec 2014 10:20:50 +0000 (11:20 +0100)]
CONTRIBUTE: Use consistent spelling for 'ChangeLog'.

9 years agoUnbreak jumping to an alias's definition
Dmitry Gutov [Mon, 29 Dec 2014 02:21:51 +0000 (04:21 +0200)]
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.

9 years agoSmall fixes in etc/grep.txt
Juri Linkov [Mon, 29 Dec 2014 00:54:41 +0000 (02:54 +0200)]
Small fixes in etc/grep.txt

9 years agoMore fixes to support multi-line search in comint
Juri Linkov [Mon, 29 Dec 2014 00:52:38 +0000 (02:52 +0200)]
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.

9 years ago* lisp/vc/vc-dir.el (vc-dir-display-file): New command.
Juri Linkov [Mon, 29 Dec 2014 00:47:05 +0000 (02:47 +0200)]
* 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
9 years agoDeclare many etags command obsolete; update the goto menu
Dmitry Gutov [Mon, 29 Dec 2014 00:36:57 +0000 (02:36 +0200)]
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.

9 years agoMerge from origin/emacs-24
Paul Eggert [Sun, 28 Dec 2014 18:17:48 +0000 (10:17 -0800)]
Merge from origin/emacs-24

f646cd9 * build-aux/git-hooks/commit-msg: Allow tabs.

9 years agoMerge from origin/emacs-24
Paul Eggert [Sun, 28 Dec 2014 18:14:19 +0000 (10:14 -0800)]
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.

9 years ago* build-aux/git-hooks/commit-msg: Allow tabs.
Paul Eggert [Sun, 28 Dec 2014 18:05:14 +0000 (10:05 -0800)]
* build-aux/git-hooks/commit-msg: Allow tabs.

Treat them as if they were expanded to spaces, with tab stops
every 8 columns.

9 years agoFix produce_composite_width typo
Paul Eggert [Sun, 28 Dec 2014 17:00:14 +0000 (09:00 -0800)]
Fix produce_composite_width typo

* term.c (produce_composite_glyph):
Fix typo that confused number of columns for pixel width.

9 years agoMerge branch 'master' into xwidget
jave [Sun, 28 Dec 2014 16:33:38 +0000 (17:33 +0100)]
Merge branch 'master' into xwidget

9 years agolisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Eli Zaretskii [Sun, 28 Dec 2014 15:43:43 +0000 (17:43 +0200)]
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 79e2dade762491c58aa6396e35bae0ef418bafc6)

9 years agolisp/international/mule.el (define-coding-system): Improve docstring.
Kenichi Handa [Sun, 28 Dec 2014 13:17:33 +0000 (22:17 +0900)]
lisp/international/mule.el (define-coding-system): Improve docstring.

Backported from trunk; do not merge back.

(cherry picked from commit 5979af512bf5d6a28acea24299b67c7939d9e703)

9 years agolisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Eli Zaretskii [Sun, 28 Dec 2014 15:43:43 +0000 (17:43 +0200)]
lisp/international/mule.el (define-coding-system): Fix typos in the doc string.
Add missing ChangeLog entry for the previous commit.

9 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
K. Handa [Sun, 28 Dec 2014 14:16:13 +0000 (23:16 +0900)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

9 years agoshr table header/footer fixes
Ivan Shmakov [Sun, 28 Dec 2014 14:06:05 +0000 (15:06 +0100)]
shr table header/footer fixes

Fixes: debbugs:19444
* lisp/net/shr.el (shr-tag-table): Fix handling of tbody/header/footer
elements in tables.

9 years agoFix eww typo in "up" handling
Ivan Shmakov [Sun, 28 Dec 2014 13:54:46 +0000 (14:54 +0100)]
Fix eww typo in "up" handling

Fixes: debbugs:19445
* lisp/net/eww.el (eww-handle-link): Fix typo in "up" rel handling.

9 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
K. Handa [Sun, 28 Dec 2014 13:18:39 +0000 (22:18 +0900)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

9 years ago(define-coding-system): Improve docstring.
Kenichi Handa [Sun, 28 Dec 2014 13:17:33 +0000 (22:17 +0900)]
(define-coding-system): Improve docstring.

9 years agoWrap dll functions more simply
Paul Eggert [Fri, 26 Dec 2014 17:32:06 +0000 (09:32 -0800)]
Wrap dll functions more simply

* decompress.c, gnutls.c, image.c, xml.c:
If WINDOWSNT, use '#define FOO fn_FOO' to wrap dll functions,
rather than the inverse when not WINDOWSNT.  This isolates the
fn_* business into the WINDOWSNT-specific section of the code,
which makes it easier to maintain the generic code.
* decompress.c (DEF_ZLIB_FN, LOAD_ZLIB_FN):
* gnutls.c (DEF_GNUTLS_FN, LOAD_GNUTLS_FN):
* image.c (DEF_IMGLIB_FN, LOAD_IMGLIB_FN):
* xml.c (DEF_XML2_FN, LOAD_XML2_FN):
Remove.  All uses replaced by DEF_DLL_FN.
* w32.h (DEF_DLL_FN, LOAD_DLL_FN): New macros.

9 years agoMerge from origin/emacs-24
Paul Eggert [Sun, 28 Dec 2014 08:07:00 +0000 (00:07 -0800)]
Merge from origin/emacs-24

b54f572 Port memory-full checking to GnuTLS 3.3

Conflicts:
  src/ChangeLog
  src/gnutls.c

9 years agoPort memory-full checking to GnuTLS 3.3
Paul Eggert [Sun, 28 Dec 2014 07:44:25 +0000 (23:44 -0800)]
Port memory-full checking to GnuTLS 3.3

Instead of using gnutls_global_set_mem_functions, check every call
to a GnuTLS function that might return an indication of memory
exhaustion.  Suggested by Dmitry Antipov in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02056.html
* src/gnutls.c (gnutls_global_set_mem_functions) [WINDOWSNT]: Remove.
(init_gnutls_functions): Do not load gnutls_global_set_mem_functions.
(fn_gnutls_global_set_mem_functions) [!WINDOWSNT]: Remove.
All uses removed.
(check_memory_full): New function.
(emacs_gnutls_handshake, emacs_gnutls_handle_error)
(gnutls_make_error, Fgnutls_boot): Use it.
(emacs_gnutls_global_init): Avoid gnutls_global_set_mem_functions.

9 years agoAvoid compilation warning in saveplace.el for dired-current-directory
Juri Linkov [Sun, 28 Dec 2014 00:52:50 +0000 (02:52 +0200)]
Avoid compilation warning in saveplace.el for dired-current-directory

9 years agoUse diff faces for compare-windows
Juri Linkov [Sun, 28 Dec 2014 00:48:05 +0000 (02:48 +0200)]
Use diff faces for compare-windows

* lisp/vc/compare-w.el: Require diff-mode for diff faces.
(compare-windows-removed, compare-windows-added): New faces
inheriting from diff faces.
(compare-windows): Define obsolete face alias.
(compare-windows-highlight): Replace face `compare-windows' with
new faces `compare-windows-added' and `compare-windows-removed'.
(compare-windows-get-recent-window): Signal an error when
no other window is found.

Fixes: debbugs:19451
9 years agopython.el: Native readline completion.
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 23:58:45 +0000 (20:58 -0300)]
python.el: Native readline completion.

This commit adds native readline completion that fallbacks to the old
mechanism when it cannot be used for the current interpreter.

* lisp/progmodes/python.el (python-shell-completion-native-disabled-interpreters)
(python-shell-completion-native-enable)
(python-shell-completion-native-output-timeout): New defcustoms.
(python-shell-completion-native-interpreter-disabled-p)
(python-shell-completion-native-try)
(python-shell-completion-native-setup)
(python-shell-completion-native-turn-off)
(python-shell-completion-native-turn-on)
(python-shell-completion-native-turn-on-maybe)
(python-shell-completion-native-turn-on-maybe-with-msg)
(python-shell-completion-native-toggle): New functions.
(python-shell-completion-native-get-completions): New function.
(python-shell-completion-at-point): Use it.

* test/automated/python-tests.el
(python-shell-completion-native-interpreter-disabled-p-1): New
test.

9 years ago(elisp--xref-identifier-file): Skip features that have no sources
Dmitry Gutov [Sat, 27 Dec 2014 23:54:43 +0000 (01:54 +0200)]
(elisp--xref-identifier-file): Skip features that have no sources

* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-file):
Skip features that have no sources.

9 years ago* test/automated/let-alist.el: Load dependency.
Glenn Morris [Sat, 27 Dec 2014 23:33:08 +0000 (15:33 -0800)]
* test/automated/let-alist.el: Load dependency.

9 years agoHandle nil value of suggest-key-bindings
Dmitry Gutov [Sat, 27 Dec 2014 23:24:17 +0000 (01:24 +0200)]
Handle nil value of suggest-key-bindings

* lisp/simple.el (execute-extended-command):
When `suggest-key-bindings' is nil, don't.

9 years agopython.el: Enhance shell user interaction and deprecate python-shell-get-or-create...
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 23:12:00 +0000 (20:12 -0300)]
python.el: Enhance shell user interaction and deprecate python-shell-get-or-create-process.

* lisp/progmodes/python.el
(python-shell-get-process-or-error): New function.
(python-shell-with-shell-buffer): Use it.
(python-shell-send-string, python-shell-send-region)
(python-shell-send-buffer, python-shell-send-defun)
(python-shell-send-file, python-shell-switch-to-shell): Use it.
Add argument MSG to display user-friendly message when no process
is running.
(python-shell-switch-to-shell): Call pop-to-buffer with NORECORD.
(python-shell-make-comint): Rename argument SHOW from POP.  Use
display-buffer instead of pop-to-buffer.
(run-python): Doc fix.  Return process.
(python-shell-get-or-create-process): Make obsolete.

* test/automated/python-tests.el (python-shell-get-or-create-process-1)
(python-shell-get-or-create-process-2)
(python-shell-get-or-create-process-3): Remove tests.

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 23:09:32 +0000 (20:09 -0300)]
Merge from origin/emacs-24

433af0a * lisp/progmodes/python.el (python-shell-buffer-substring): Handle cornercase when region sent starts at point-min.

9 years ago* lisp/progmodes/python.el (python-shell-buffer-substring): Handle
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 20:22:29 +0000 (17:22 -0300)]
* lisp/progmodes/python.el (python-shell-buffer-substring): Handle
cornercase when region sent starts at point-min.

9 years agoFix parse_settings to match internal documentation
Paul Eggert [Sat, 27 Dec 2014 20:00:29 +0000 (12:00 -0800)]
Fix parse_settings to match internal documentation

* xsettings.c (parse_settings): Return the number of settings seen.
Count the settings changes accurately.
(read_settings): Don't confuse number of settings changes with
the return code from XGetWindowProperty.

9 years agoFix compilation of lib-src executables on MS-Windows.
Eli Zaretskii [Sat, 27 Dec 2014 19:46:03 +0000 (21:46 +0200)]
Fix compilation of lib-src executables on MS-Windows.

 lib-src/Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
 (make-docfile${EXEEXT}, movemail${EXEEXT})
 (update-game-score${EXEEXT}): Put $(NTLIB) before $(LOADLIBES),
 since GCC sometimes calls stpcpy when it sees strcpy, under
 optimization switches.  Reported by Dani Moncayo <dmoncayo@gmail.com>.

9 years agoSanitize ChangeLog entries for previous merges.
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 17:15:05 +0000 (14:15 -0300)]
Sanitize ChangeLog entries for previous merges.

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:31:20 +0000 (13:31 -0300)]
Merge from origin/emacs-24

a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line.  (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.

Conflicts:
doc/lispref/ChangeLog
doc/lispref/control.texi
etc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:27:15 +0000 (13:27 -0300)]
Merge from origin/emacs-24

The following commit was skipped:

5fc8210 Backport: Memory leak fix and 19133 fix.

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:26:58 +0000 (13:26 -0300)]
Merge from origin/emacs-24

bef46ba Fix bad bug number reference, shall be 19427.

Conflicts:
src/ChangeLog

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:21:17 +0000 (13:21 -0300)]
Merge from origin/emacs-24

The following commit was skipped:

2566f38 Backport: Don't cache images in nsimage.m (Bug#18918).

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:21:17 +0000 (13:21 -0300)]
Merge from origin/emacs-24

216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623

Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/functions.texi
lisp/ChangeLog
src/ChangeLog
src/xterm.c
test/ChangeLog

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:17:18 +0000 (13:17 -0300)]
Merge from origin/emacs-24

The following commit was skipped:

48a9d9f Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:16:44 +0000 (13:16 -0300)]
Merge from origin/emacs-24

230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.

Conflicts:
lisp/ChangeLog

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:15:55 +0000 (13:15 -0300)]
Merge from origin/emacs-24

The following commit was skipped:

09ab6fe Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

9 years agoMerge from origin/emacs-24
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:15:55 +0000 (13:15 -0300)]
Merge from origin/emacs-24

2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
c773edc * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403.
8032fc1 * .gitignore: Ignore /conftest*.
fb420e7 * lisp/subr.el (sit-for): Tweak docstring.
061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited
bb57c94 Consider electric-pair-mode in tex-mode.
7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
59c218f ChangeLog fix
db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format
d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.

Conflicts:
ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog

9 years agoFix ChangeLog typo
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 16:10:44 +0000 (13:10 -0300)]
Fix ChangeLog typo

9 years agoelisp-xref-find: Don't create buffers eagerly
Dmitry Gutov [Sat, 27 Dec 2014 14:06:37 +0000 (16:06 +0200)]
elisp-xref-find: Don't create buffers eagerly

* lisp/emacs-lisp/find-func.el (find-function-library): New function,
extracted from `find-function-noselect'.

* lisp/progmodes/elisp-mode.el (elisp--identifier-location): Fold back
into `elisp--company-location'.
(elisp--identifier-completion-table): Rename to
`elisp--identifier-completion-table', and do not include just any
symbols with a property list.
(elisp-completion-at-point): Revert the 2014-12-25 change.
(elisp--xref-identifier-file): New function.
(elisp--xref-find-definitions): Use it.

* lisp/progmodes/xref.el (xref-elisp-location): New class.
(xref-make-elisp-location): New function.
(xref-location-marker): New implementation.

9 years agoFix composition of characters from Syriac and Arabis scripts.
Eli Zaretskii [Sat, 27 Dec 2014 12:07:06 +0000 (14:07 +0200)]
Fix composition of characters from Syriac and Arabis scripts.

 lisp/language/misc-lang.el (composition-function-table): Add Syriac
 characters and also ZWJ/ZWNJ.  See
 http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
 for the details.

9 years agoAuto-commit of loaddefs files.
Glenn Morris [Sat, 27 Dec 2014 11:17:50 +0000 (06:17 -0500)]
Auto-commit of loaddefs files.

9 years agopython.el: Fix message when sending region.
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 07:01:32 +0000 (04:01 -0300)]
python.el: Fix message when sending region.

* lisp/progmodes/python.el (python-shell-send-region): Rename argument
send-name from nomain.  Fix message.
(python-shell-send-buffer): Rename argument send-name from arg.

9 years agopython.el: Cleanup temp files even with eval errors.
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 06:38:32 +0000 (03:38 -0300)]
python.el: Cleanup temp files even with eval errors.

* lisp/progmodes/python.el (python-shell-send-file): Make file-name
mandatory.  Fix temp file removal in the majority of cases.

9 years agoFix for previous commit
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 06:32:01 +0000 (03:32 -0300)]
Fix for previous commit

9 years agopython.el: Handle file encoding for shell.
Fabián Ezequiel Gallina [Sat, 27 Dec 2014 04:30:21 +0000 (01:30 -0300)]
python.el: Handle file encoding for shell.

* lisp/progmodes/python.el (python-rx-constituents): Add coding-cookie.
(python-shell--save-temp-file): Write file with proper encoding.
(python-shell-buffer-substring): Add coding cookie for detected
encoding to generated content.  Fix blank lines when removing
if-name-main block.
(python-shell-send-file): Handle file encoding.
(python-info-encoding-from-cookie)
(python-info-encoding): New functions.

* test/automated/python-tests.el (python-shell-buffer-substring-1)
(python-shell-buffer-substring-2, python-shell-buffer-substring-3)
(python-shell-buffer-substring-4, python-shell-buffer-substring-5)
(python-shell-buffer-substring-6, python-shell-buffer-substring-7)
(python-shell-buffer-substring-8)
(python-info-encoding-from-cookie-1)
(python-info-encoding-from-cookie-2)
(python-info-encoding-from-cookie-3)
(python-info-encoding-from-cookie-4)
(python-info-encoding-from-cookie-5)
(python-info-encoding-from-cookie-6)
(python-info-encoding-from-cookie-7, python-info-encoding-1)
(python-info-encoding-2): New tests.

9 years agoAvoid duplicate calls of window-height in with-displayed-buffer-window
Juri Linkov [Sat, 27 Dec 2014 00:54:56 +0000 (02:54 +0200)]
Avoid duplicate calls of window-height in with-displayed-buffer-window

* lisp/minibuffer.el (minibuffer-completion-help):
Use shrink-window-if-larger-than-buffer in window-height
when temp-buffer-resize-mode is nil.

* lisp/window.el (with-displayed-buffer-window): Remove window-height
from the action alist in the temp-buffer-window-show call
when window-height is handled explicitly afterwards.

Fixes: debbugs:19355
9 years agoSupport subdirectories when saving places in dired.
Juri Linkov [Sat, 27 Dec 2014 00:38:34 +0000 (02:38 +0200)]
Support subdirectories when saving places in dired.

* lisp/saveplace.el (toggle-save-place, save-place-to-alist)
(save-places-to-alist, save-place-dired-hook):
Use dired-current-directory instead of dired-directory.
(save-place-dired-hook): Add check for alist to make the new
format future-proof to allow other possible formats.

Fixes: debbugs:19436
9 years agoFix ChangeLog
Filipp Gunbin [Sat, 27 Dec 2014 00:25:59 +0000 (03:25 +0300)]
Fix ChangeLog

9 years agoUse bool for boolean in xselect.c, xsettings.c
Paul Eggert [Fri, 26 Dec 2014 21:43:00 +0000 (13:43 -0800)]
Use bool for boolean in xselect.c, xsettings.c

* xselect.c (x_get_local_selection, struct selection_data)
(x_selection_request_lisp_error, struct prop_location)
(x_handle_selection_request, x_convert_selection)
(waiting_for_other_props_on_window, expect_property_change)
(wait_for_property_change, x_handle_property_notify)
(x_get_foreign_selection, x_get_window_property)
(receive_incremental_selection)
(x_get_window_property_as_lisp_data)
(lisp_data_to_selection_data, Fx_get_selection_internal)
(x_send_client_event):
* xselect.c, xterm.h (x_handle_dnd_message):
* xsettings.c (dpyinfo_valid, parse_settings, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_gsettings, init_xsettings)
(syms_of_xsettings):
Use bool for boolean.
* xselect.c (x_get_window_property): Omit last arg, which was an
unused boolean.
* xsettings.c (apply_xft_settings): Remove 2nd arg, which was
always true.  All callers changed.

9 years agopython.el: Generate clearer shell buffer names.
Fabián Ezequiel Gallina [Fri, 26 Dec 2014 20:59:33 +0000 (17:59 -0300)]
python.el: Generate clearer shell buffer names.

* lisp/progmodes/python.el (python-shell-get-process-name)
(python-shell-internal-get-process-name): Use `buffer-name`.
(python-shell-internal-get-or-create-process): Simplify.

* test/automated/python-tests.el (python-shell-get-process-name-1)
(python-shell-internal-get-process-name-1): Cleanup.
(python-shell-get-process-name-2)
(python-shell-internal-get-process-name-2): New tests.
(python-shell-calculate-command-1)
(python-shell-calculate-process-environment-3)
(python-shell-calculate-exec-path-2, python-shell-make-comint-1)
(python-shell-make-comint-2, python-shell-make-comint-4)
(python-shell-get-process-1, python-util-clone-local-variables-1):
Replace obsolete function and variable references with current.

9 years agoRevert "Prevent Python process shell buffer to pop twice."
Fabián Ezequiel Gallina [Fri, 26 Dec 2014 20:14:18 +0000 (17:14 -0300)]
Revert "Prevent Python process shell buffer to pop twice."

This reverts commit 4256626a7ac486446f4dea9c12df3057053825a7.

9 years agoAdd basic xref apropos implementation to elisp-mode
Dmitry Gutov [Fri, 26 Dec 2014 16:34:47 +0000 (18:34 +0200)]
Add basic xref apropos implementation to elisp-mode

* lisp/progmodes/elisp-mode.el (elisp--xref-find-definitions):
Filter out nil results.
(elisp--xref-find-apropos): New function.
(elisp-xref-find): Use it.

* lisp/progmodes/xref.el (xref--show-xrefs): Use `user-error'.

9 years agomake dired-maybe-insert-subdir always skip trivial files
Filipp Gunbin [Thu, 25 Dec 2014 18:17:43 +0000 (21:17 +0300)]
make dired-maybe-insert-subdir always skip trivial files

9 years agoMS-Windows followup to stpcpy changes.
Eli Zaretskii [Fri, 26 Dec 2014 09:52:24 +0000 (11:52 +0200)]
MS-Windows followup to stpcpy changes.

 src/w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead
 of strcat.
 src/w32menu.c (add_menu_item): Use stpcpy instead of strcat.
 src/w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of
 strcat.

 nt/gnulib.mk (stpcpy, string): Sync with the latest change in
 lib/gnulib.mk.

9 years agoUse bool for boolean in xsmfns.c
Paul Eggert [Fri, 26 Dec 2014 02:42:51 +0000 (18:42 -0800)]
Use bool for boolean in xsmfns.c

* xsmfns.c, xterm.h (x_session_have_connection):
* xsmfns.c (doing_interact, smc_interact_CB, Fhandle_save_session):
Use bool for boolean.
(x_session_initialize, Fhandle_save_session):
Prefer NILP (x) to EQ (x, Qnil).

9 years agoSpelling fixes
Paul Eggert [Fri, 26 Dec 2014 02:18:42 +0000 (18:18 -0800)]
Spelling fixes

9 years agoSpelling fixes
Paul Eggert [Fri, 26 Dec 2014 02:07:15 +0000 (18:07 -0800)]
Spelling fixes

9 years agoPrefer stpcpy to strcat
Paul Eggert [Thu, 25 Dec 2014 12:19:17 +0000 (04:19 -0800)]
Prefer stpcpy to strcat

* admin/merge-gnulib (GNULIB_MODULES): Add stpcpy.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stpcpy.c, m4/stpcpy.m4: New files, from gnulib.
* lib-src/ebrowse.c (sym_scope_1, operator_name, open_file):
* lib-src/emacsclient.c (get_server_config, set_local_socket)
(start_daemon_and_retry_set_socket):
* lib-src/etags.c (main, C_entries, relative_filename):
* lib-src/pop.c (sendline):
* lib-src/update-game-score.c (main):
* lwlib/xlwmenu.c (resource_widget_value):
* src/callproc.c (child_setup):
* src/dbusbind.c (xd_signature_cat):
* src/doc.c (get_doc_string, Fsnarf_documentation):
* src/editfns.c (Fuser_full_name):
* src/frame.c (xrdb_get_resource):
* src/gtkutil.c (xg_get_file_with_chooser):
* src/tparam.c (tparam1):
* src/xfns.c (xic_create_fontsetname):
* src/xrdb.c (gethomedir, get_user_db, get_environ_db):
* src/xsmfns.c (smc_save_yourself_CB):
Rewrite to avoid the need for strcat, typically by using stpcpy
and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
* src/doc.c (sibling_etc):
* src/xrdb.c (xdefaults):
Now a top-level static constant.

9 years ago* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
Michael Albinus [Thu, 25 Dec 2014 21:00:08 +0000 (22:00 +0100)]
* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
expect a given order of "." and "..".

9 years agoRegenerate ldefs-boot.el
Dmitry Gutov [Thu, 25 Dec 2014 20:18:36 +0000 (22:18 +0200)]
Regenerate ldefs-boot.el

9 years agoConsolidate cross-referencing commands
Dmitry Gutov [Thu, 25 Dec 2014 20:08:19 +0000 (22:08 +0200)]
Consolidate cross-referencing commands

Move autoloaded bindings for `M-.', `M-,', `C-x 4 .' and
`C-x 5 .' from etags.el to xref.el.

* progmodes/xref.el: New file.

* progmodes/elisp-mode.el (elisp--identifier-types): New variable.
(elisp--identifier-location): New function, extracted from
`elisp--company-location'.
(elisp--company-location): Use it.
(elisp--identifier-completion-table): New variable.
(elisp-completion-at-point): Use it.
(emacs-lisp-mode): Set the local values of `xref-find-function'
and `xref-identifier-completion-table-function'.
(elisp-xref-find, elisp--xref-find-definitions)
(elisp--xref-identifier-completion-table): New functions.

* progmodes/etags.el (find-tag-marker-ring): Mark obsolete in
favor of `xref--marker-ring'.
(tags-lazy-completion-table): Autoload.
(tags-reset-tags-tables): Use `xref-clear-marker-stack'.
(find-tag-noselect): Use `xref-push-marker-stack'.
(pop-tag-mark): Make an alias for `xref-pop-marker-stack'.
(etags--xref-limit): New constant.
(etags-xref-find, etags--xref-find-definitions): New functions.

9 years ago* etc/NEWS: Mention new buffer display behavior for `shell'.
Karl Fogel [Thu, 25 Dec 2014 19:28:51 +0000 (13:28 -0600)]
* etc/NEWS: Mention new buffer display behavior for `shell'.

This follows up to Sam Steingold's change of 2014-12-23
in ../lisp/shell.el, in git commit e55a467ec0f758c311d3.

9 years agoFix rendering of composed caharacters on the mode line. (Bug#19435)
Eli Zaretskii [Thu, 25 Dec 2014 15:38:15 +0000 (17:38 +0200)]
Fix rendering of composed caharacters on the mode line.  (Bug#19435)

 src/xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
 composition_compute_stop_pos to the number of characters in the
 string.
 <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code.
 src/composite.c (composition_compute_stop_pos): If no composition
 was found in a string before ENDPOS, and ENDPOS is the string end,
 no need to back up to a safe point.
 src/dispextern.h (struct it) <end_charpos>: Improve commentary.

9 years agoMake `resize-mini-windows' customizable and update documentation for it.
Martin Rudalics [Thu, 25 Dec 2014 13:13:26 +0000 (14:13 +0100)]
Make `resize-mini-windows' customizable and update documentation for it.

* cus-start.el (resize-mini-windows): Make it customizable.
* minibuf.texi (Minibuffer Windows): Add descriptions of
`resize-mini-windows' and `max-mini-window-height'.

9 years agoResync @menu order with @node order.
Martin Rudalics [Thu, 25 Dec 2014 09:59:21 +0000 (10:59 +0100)]
Resync @menu order with @node order.

9 years ago* doc/lispref/windows.texi (Windows): Sync @menu order with @node order.
Glenn Morris [Thu, 25 Dec 2014 01:10:21 +0000 (17:10 -0800)]
* doc/lispref/windows.texi (Windows): Sync @menu order with @node order.

9 years ago* doc/lispref/sequences.texi (Sequence Functions): Copyedits.
Glenn Morris [Thu, 25 Dec 2014 00:55:57 +0000 (16:55 -0800)]
* doc/lispref/sequences.texi (Sequence Functions): Copyedits.

9 years agoMarkup fixes for doc/lispref
Glenn Morris [Thu, 25 Dec 2014 00:54:55 +0000 (16:54 -0800)]
Markup fixes for doc/lispref

* doc/lispref/control.texi (Pattern matching case statement):
* doc/lispref/positions.texi (List Motion):
* doc/lispref/streams.texi (Output Functions):
* doc/lispref/strings.texi (Text Comparison):
* doc/lispref/text.texi (Document Object Model):
Markup fixes.

9 years agoSmall doc markup fixes
Glenn Morris [Thu, 25 Dec 2014 00:00:44 +0000 (16:00 -0800)]
Small doc markup fixes

* doc/lispref/control.texi (Pattern matching case statement):
* doc/lispref/os.texi (Desktop Notifications): Markup fixes.

9 years ago* doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
Glenn Morris [Wed, 24 Dec 2014 23:57:34 +0000 (15:57 -0800)]
* doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.

9 years agoauthors.el updates
Glenn Morris [Wed, 24 Dec 2014 23:19:52 +0000 (15:19 -0800)]
authors.el updates

* admin/authors.el (authors-obsolete-files-regexps)
(authors-ignored-files, authors-valid-file-names)
(authors-renamed-files-alist, authors-renamed-files-regexps):
Additions.

9 years agoChangeLog fixes
Glenn Morris [Wed, 24 Dec 2014 23:19:25 +0000 (15:19 -0800)]
ChangeLog fixes