Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
116504 commits 244 branches 194 tags 1.4 GiB
Commit graph

116504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eli Zaretskii
ff953bc93b .gitignore: Resurrect Windows-specific ignorables lost in last changes. 2014-11-19 21:13:34 +02:00
Eli Zaretskii
2fa082c003 Fix VC documentation related to switching branches. 
lisp/vc/vc.el (vc-retrieve-tag): Doc fix.

 doc/emacs/maintaining.texi (Switching Branches): Mention "C-x v r".
 Correct commands for switching branches in various VCSs.
 2014-11-19 20:35:17 +02:00
Paul Eggert
f773d35aa2 * .gitignore: Add /emacs-[1-9]*/, and sort better. 2014-11-19 10:32:08 -08:00
Ivan Andrus
fe1b545d77 * .gitignore: Add some nextstep/mac ignorables. 2014-11-18 00:21:37 -07:00
Paul Eggert
342bc0e04b .gitignore cleanup. 
* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.
 2014-11-17 17:58:28 -08:00
Oscar Fuentes
81e0cca7bb Define MINGW_W64 and use it instead of _W64 
... for detecting MinGW-w64. _W64 is not specific of MinGW-w64, it is
defined for compatibility with MS VC++.

	* nt/inc/ms-w32.h: Define MINGW_W64.

	* admin/CPP-DEFINES: Mention MINGW_W64.

	* nt/addpm.c: Use it.

	* nt/addsection.c: Use it.

	* nt/preprep.c: Use it.

	* src/w32.c: Use MINGW_W64 instead of _W64

	* src/w32term.c: Likewise.
 2014-11-17 23:10:00 +01:00
Eli Zaretskii
67a22c6062 Don't assume "bzr log" uses --long format by default. 
lisp/vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
 Don't assume --long is the default for "bzr log", always specify
 it explicitly, in case the user defined an alias for 'log' that
 uses some other format.
 2014-11-17 19:36:29 +02:00
Paul Eggert
2e00757195 Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. 
* .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1").  See Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
 2014-11-16 19:43:46 -08:00
Paul Eggert
790c690572 Simplify and fix doc-related .gitignore files. 
This fixes some unwanted 'git status' output after 'make docs'.
* .gitignore: Add **/Makefile, **/makefile.
Remove Makefile, makefile.
Add doc/*/*.xxx rules for the usual kinds of documentation outputs
and temporaries.  Add doc/misc/cc-mode.ss.
* doc/emacs/.gitignore, doc/lispref/.gitignore, doc/misc/.gitignore:
* lwlib/.gitignore, oldXMenu/.gitignore:
Remove, as these .gitignore files are no longer needed.
* doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
 2014-11-16 17:32:01 -08:00
Fabián Ezequiel Gallina
cf100f60a6 Prevent resizing the echo area when iPython is enabled 
Fixes: debbugs:18794

* lisp/progmodes/python.el (python-eldoc--get-doc-at-point): Strip
shell output before returning.
 2014-11-16 11:11:49 -03:00
Dmitry Gutov
c613f4d6c1 Fix indentation before !=' and after +=' 
Originally reported in https://github.com/mooz/js2-mode/issues/174.
* lisp/progmodes/js.el (js--indent-operator-re): Make assignments and
(in)equality operator a separate case.
(js--continued-expression-p): Escape the second `+' in the regexp.
 2014-11-16 14:19:16 +02:00
Tassilo Horn
202f4941dc Fix DocView slicing docs 
* doc/emacs/misc.texi (DocView Slicing): Describe how to slice with the
mouse.  Fix command mentioned by slice by BoundingBox paragraph.
(Bug#18040)
 2014-11-16 09:39:01 +01:00
Stefan Monnier
8679082639 * src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). 
* lisp/window.el (handle-select-window): Deactivate shift-region.
 2014-11-16 00:30:12 -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
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
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
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
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
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
Paul Eggert
f8c4f8d6a7 Backport fix for minor Bazaar leftovers. 
Reported by Perry E. Metzger in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
* .dir-locals.el: Remove reference to bzr commit --fixes debbugs.
* etc/CONTRIBUTE: More git transition.
 2014-11-13 12:30:02 -08:00
Eli Zaretskii
5cf2e27cf7 .gitignore: Add more ignorables. 2014-11-13 18:06:54 +02:00
Lars Magne Ingebrigtsen
3d08bc4e30 Backport .gitignore changes from master. 
.gitignore: Copy over sufficient ignorable files from the old
 .bzrignore that a simple build doesn't list lots of unregistered
 files.
 2014-11-13 17:58:07 +02:00
Adam Sjøgren
e18c2a53a9 [Backport] lisp/gnus/mml2015.el (mml2015-display-key-image): New variable 2014-11-13 04:22:36 +00:00
Eric S. Raymond
ac03795dc4 Git transition patch 
All bzr revision IDS, and all CVS revision IDs for which a commit
could be identified, were changed to time-date!committer version
stamps. All .cvsignore files in the history became .gitignore files.
Fixes-bug annotations from bzr were copied into the corresponding
commit comments.

(The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>.
The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>)

Committer/author email addresses are generally correct for the
transition day, not necessarily when the commit was originally made.
 2014-11-11 13:28:05 -05:00
Glenn Morris
7611d85a45 ChangeLog tweak 2014-11-10 08:47:16 -08:00
Kelvin White
fbc782bd18 fix version tags 2014-11-10 05:38:11 -05:00
Katsumi Yamaoka
02ded86f07 doc/misc/ChangeLog: Fix date for 2014-08-13T13:14:43Z!kwhite@gnu.org 2014-11-10 09:30:26 +00:00
Tassilo Horn
7f829fafcc doc/misc/{gnus.texi,gnus-faq.texi}: Update docs wrt shr/html mail 
* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.
* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.
 2014-11-10 09:28:18 +00:00
Glenn Morris
edfdb22f67 * lisp/startup.el (command-line): Handle nil elements in load-path. 2014-11-09 23:12:37 -08:00
Eli Zaretskii
03400ec333 Fix bug #18955 with failure generating macuvs.h on MS-Windows. 
admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
 unmsys--file-name.
 2014-11-09 22:44:51 +02:00
Eli Zaretskii
ea75a0e069 Fix bug #18982 with assertion violations when reverting buffers. 
src/fileio.c (Finsert_file_contents): Invalidate buffer caches also
 when the inserted text does not need decoding.
 2014-11-09 18:40:43 +02:00
Eli Zaretskii
2ae1e0d427 Fix bug #18995 with compiling w32heap.c with -funroll-loops. 
src/w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.
 2014-11-09 17:57:37 +02:00
Jan Djärv
d29658759a * nsterm.h (EmacsScroller): judge returns bool. 
* nsterm.m (ns_set_vertical_scroll_bar): Release bar.
(ns_judge_scroll_bars): Only set removed if judge returns true.
(judge): Returns bool == condemned.  Remove self from window.
(setPosition:portion:whole:): Remove raise SIGIO.

Fixes: debbugs:18757
 2014-11-09 14:47:02 +01:00
Kelvin White
ea283d21fc Update version to 24.5 2014-11-09 08:46:24 -05:00
Kelvin White
bcc9e35de5 backports: fix changelog 2014-11-09 08:36:43 -05:00