1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Commit graph

118160 commits

Author SHA1 Message Date
Fabián Ezequiel Gallina
651ebee618 Fixes: debbugs:18596
* lisp/progmodes/python.el (run-python): Allow CMD to be optional and
default it to a safe command, even for Windows.  (bug#18596)
2014-11-16 11:20:25 -03:00
Óscar Fuentes
48b2b32783 Add faces for the VC modeline state indicator.
Fixes: debbugs:19043

Add faces for the VC modeline state indicator.
* lisp/vc/vc-hooks.el: (vc-state-faces, vc-state-base-face
vc-up-to-date-state, vc-needs-update-state, vc-locked-state)
vc-locally-added-state, vc-conflict-state, vc-removed-state,
vc-missing-state, vc-edited-state): New faces.
(vc-default-mode-line-string): Use them (bug#19043).
2014-11-16 15:06:55 +01:00
Fabián Ezequiel Gallina
6f167f95dc * lisp/progmodes/python.el (python-shell-calculate-command): Rename
from python-shell-parse-command.  Cleanup.
(run-python, run-python-internal): Use it.
(python-shell-calculate-pythonpath): Rename from
python-new-pythonpath.
(python-shell-calculate-process-environment): Use it.
(python-shell-calculate-exec-path): Add comment.

* test/automated/python-tests.el
(python-shell-calculate-process-environment-2): Fix test.
(python-shell-calculate-process-environment-1)
(python-shell-calculate-process-environment-3): Cleanup.
2014-11-16 10:47:14 -03:00
Paul Eggert
2444ac6de8 Fix ChangeLog typos. 2014-11-15 23:23:07 -08:00
Jay Belanger
bc5d86fe90 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
	lisp/ChangeLog
2014-11-15 23:27:48 -06:00
Thierry Banel
1a30156b98 2014-11-16 Thierry Banel <tbanelwebmin@free.fr> (tiny change)
* calc-arith.el (math-max-list, math-min-list): Fix bug
for date handling.
2014-11-15 23:24:25 -06:00
Stefan Monnier
1a713024a0 Resolve pull conflict 2014-11-16 00:23:39 -05:00
Stefan Monnier
9075fcc193 Merge from emacs-24 2014-11-16 00:22:20 -05:00
Oscar Fuentes
d409545938 Add faces for the VC modeline state indicator
* lisp/vc/vc-hooks.el:
(vc-state-faces, vc-state-base-face)
(vc-up-to-date-state, vc-needs-update-state)
(vc-locked-state, vc-locally-added-state)
(vc-conflict-state, vc-removed-state)
(vc-missing-state, vc-edited-state):
New faces.
(vc-default-mode-line-string): Use them
2014-11-16 06:16:41 +01:00
Stefan Monnier
86009dd5d8 * lisp/emacs-lisp/backquote.el (backquote-process): Optimize away the ,' case. 2014-11-15 23:59:50 -05:00
Andreas Schwab
4f4cf9c855 Don't ignore .gitattributes
Local attributes belong to .git/info/attributes.
2014-11-16 00:51:01 +01:00
Andreas Schwab
1033147831 Use git rev-parse to get repository version
* version.el (emacs-repository-get-version): Use git rev-parse
instead of git log.
2014-11-16 00:27:58 +01:00
Glenn Morris
899a5a9882 Backport 2014-06-30 admin/update_autogen change
* admin/update_autogen: Auto-detect VCS in use.
(vcs): New variable.
(status, commit, main): Handle git.
2014-11-15 18:16:28 -05:00
Fabián Ezequiel Gallina
92f58578cc Fixes: debbugs:18432
* lisp/progmodes/python.el (python-indent-calculate-levels): Fix
indentation behavior multiline dedenter statement.

* test/automated/python-tests.el (python-indent-dedenters-8): New test
for Bug#18432.
2014-11-15 19:02:52 -03:00
Christoph Scholtes
b6cd03a825 Ignore generated file lib/stdalign.h. 2014-11-15 14:13:59 -07:00
Fabián Ezequiel Gallina
89ebffc1f6 Fix region indentation
Fixes: debbugs:18843

* lisp/progmodes/python.el (python-indent-region): Use
python-indent-line and skip special cases.

* test/automated/python-tests.el (python-indent-region-1)
(python-indent-region-2, python-indent-region-3)
(python-indent-region-4, python-indent-region-5): New tests.
2014-11-15 18:10:58 -03:00
Lars Magne Ingebrigtsen
e68a171ebd * net/eww.el (eww-search-words): Mention `eww-search-prefix'. 2014-11-15 21:19:12 +01:00
Fabián Ezequiel Gallina
9ae5396b8f Eldoc setup code enhancements
Fixes: debbugs:18962

* lisp/progmodes/python.el (python-eldoc-setup-code): Enhance string
type checks, simplify printing.
2014-11-15 15:50:30 -03:00
Lars Magne Ingebrigtsen
5fa7b7181a Use cherry-pick -xe instead of git log amend 2014-11-15 19:25:45 +01:00
Jan D
a6b42789b5 Backport: Fix for 18993.
* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).  Backport from trunk.
2014-11-15 19:20:37 +01:00
Jan D
0d9bf9725a Redo the fix, the old takes too much CPU.
Fixes: 18993

* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).
(run): Restore code before the previous 18993 fix.
2014-11-15 19:09:58 +01:00
Eli Zaretskii
1fb97e79d2 Fix bug #19060 with inaccurate pixel-based scrolling.
src/window.c (window_scroll_pixel_based): Avoid truncation/rounding
 errors in computing the number of pixels to scroll.  Suggested by
 Kelly Dean <kelly@prtime.org>.
2014-11-15 19:04:17 +02:00
Michael Albinus
d4fceca9cd Fix cherry-pick conflict. 2014-11-15 17:53:53 +01:00
Michael Albinus
260cedec96 Backport: Fixes: debbugs:18940
* vc/vc-hg.el (vc-hg-state): Disable pager.

Conflicts:
	lisp/ChangeLog
2014-11-15 17:52:14 +01:00
Lars Magne Ingebrigtsen
788bc73c80 Add a draft of a very simple git workflow 2014-11-15 17:06:34 +01:00
Lars Magne Ingebrigtsen
1040099b36 Mark last change as "tiny" 2014-11-15 16:25:55 +01:00
Peder O. Klingenberg
20478c2bd3 (report-emacs-bug): Make a better guess at envelope-from
Fixes: debbugs:19054

* mail/emacsbug.el (report-emacs-bug): Make a better guess at
  envelope-from when reporting through sendmail.
2014-11-15 16:22:29 +01:00
Jan D
b8c9a4e36d Fix getting frame size wrong when restoring desktop.
* nsmenu.m (update_frame_tool_bar): If tool bar changes height,
call updateFrameSize.
2014-11-15 14:35:15 +01:00
Jan D
836c444db7 Fixes: 18757
* nsterm.m (setFrame:): Remove call to display (Bug#18757).
2014-11-15 13:39:30 +01:00
Eli Zaretskii
71e866c066 src/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a comment.
Reported by Kelly Dean <kelly@prtime.org>.
2014-11-15 11:25:16 +02:00
Teemu Likonen
d5a1d3607b .gitignore: Add lib-src/blessmail 2014-11-15 09:10:59 +02:00
Stefan Monnier
4cd0f2dc6f * .gitignore: Add a few more missing entries. 2014-11-15 00:44:14 -05:00
Ivan Andrus
15ec2d7cff Backport Use derived-mode-p in python.el instead of equality test with major-mode
Fixes: debbugs:18854

* progmodes/python.el (python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.
2014-11-14 21:56:11 -07:00
David Reitter
658b768a65 Time-out NS event loop
OS X 10.10 will, at times, not send us the application-defined
event that is used to terminate the event loop.  As a workaround,
we define a timeout and react accordingly.  Leaving it in place
for other OSX and NS versions as a safety net.

Partial revert of 2014-11-08T16:32:37Z!jan.h.d@swipnet.se.

Fixes debbugs:18993
2014-11-14 18:07:31 -05:00
Ivan Andrus
f20a19df87 Use derived-mode-p in python.el instead of equality test on major-mode
* progmodes/python.el (python-shell-font-lock-kill-buffer):
(python-shell-font-lock-with-font-lock-buffer)
(python-shell-get-buffer, python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.
2014-11-14 13:54:10 -07:00
Andreas Schwab
a6a43d654a Don't rerun configure if lisp/version.el changes
lisp/version.el is no longer the authority for emacs-version.

* Makefile.in (config.status): Don't depend on
${srcdir}/lisp/version.el.
2014-11-14 21:47:30 +01:00
Paul Eggert
dc7a3ba28b Merge from gnulib.
2014-11-14 extern-inline: update commentary about GCC bugs
2014-11-06 unistd: port to iOS
2014-11-04 update from texinfo
* doc/misc/texinfo.tex, lib/unistd.in.h, m4/extern-inline.m4:
Update from gnulib.
2014-11-14 12:25:11 -08:00
Paul Eggert
5caf6c9358 build: port to GCC 4.6.4 + glibc 2.5
On platforms this old, building with _FORTIFY_SOURCE equal to 2
results in duplicate definitions of standard library functions.
Problem reported by Nelson H. F. Beebe.
* configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK.
By default, do not enable this unless GNULIB_PORTCHECK is defined.
This better matches the original intent, which as I recall was to
enable these extra checks only with --enable-gcc-warnings.
2014-11-14 12:25:11 -08:00
Paul Eggert
9bcde6cdca * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1. 2014-11-14 12:25:10 -08:00
Ulrich Müller
df33e85a80 (emacs-repository-get-version): Call `git log' with proper format argument
Fixes: debbugs:19049

* version.el (emacs-repository-get-version): Call `git log'
command with proper format argument (bug#19049).
2014-11-14 15:21:31 +01:00
Lars Magne Ingebrigtsen
6a079d59b7 Ignore all built versions of Emacs (and .gitattributes) 2014-11-14 14:57:16 +01:00
David Reitter
c28ef9a466 Compress publicsuffix file to save space
* url-domsuf.el (url-domsuf-parse-file): Read compressed
publicsuffix file if available.
* Makefile.in (install-arch-indep): Compress publicsuffix.txt file.
2014-11-14 07:22:01 -05:00
Dmitry Antipov
a5cbb7d9cc Attempt to allocate less font entity objects in xfont_list_pattern
* xfont.c (xfont_list_pattern): Do not allocate font entity object
for each candidate font but attempt to reuse it from previous improper
candidate, if any.
2014-11-14 13:40:24 +03:00
Jan Djärv
6688117e79 Fixes: 19036
* nsfns.m (x_set_foreground_color, x_set_background_color)
(x_set_cursor_color, Fxw_color_values): Block/unblock input,
use SET_FRAME_GARBAGED instead of redraw_frame (Bug#19036).
2014-11-14 08:41:53 +01:00
Fabián Ezequiel Gallina
eb97699236 Rename python-shell-virtualenv-path to fit GNU conventions
* lisp/progmodes/python.el (python-shell-virtualenv-root): Rename from
python-shell-virtualenv-path.
(python-shell-internal-get-process-name)
(python-shell-calculate-process-environment)
(python-shell-calculate-exec-path): Use it.
2014-11-14 03:26:08 -03:00
Eli Zaretskii
3e517d349b Fix error preloading bindings.el.
lisp/bindings.el (search-map): Fix last change: don't use 'kbd' in
 bindings.el, since it is not yet loaded when bindings.el is preloaded.
2014-11-14 08:14:06 +02:00
Fabián Ezequiel Gallina
5d977b968c * lisp/progmodes/python.el (python-shell-completion-get-completions):
Fix previous merge.
2014-11-14 02:29:40 -03:00
Lars Magne Ingebrigtsen
f48827adba * net/eww.el (eww-render): Don't set the title to the URL. 2014-11-14 05:08:34 +01:00
Ulrich Müller
7169391ddb (emacs-repository-get-version): Call `git log' with proper format argument
Fixes: debbugs:19049

* version.el (emacs-repository-get-version): Call `git log'
command with proper format argument (bug#19049).
2014-11-14 05:03:32 +01:00
Kenjiro NAKAYAMA
3bdc6ce7e3 Bind M-s M-s' globally to eww-search-words'
Fixes: debbugs:16258

* etc/NEWS: Mention the new `M-s M-s' keystroke.

* lisp/bindings.el (search-map): Bind M-s M-s to `eww-search-words'.

* net/eww.el (eww-search-words): New command.
2014-11-14 04:46:11 +01:00