summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | Merge from trunkJason Rumney2010-01-142004-2544/+2907
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge from trunkJason Rumney2010-01-1114-22/+87
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merged from trunkJason Rumney2010-01-102-1/+6
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merged from trunkJason Rumney2010-01-1023-184/+1373
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge from trunkJason Rumney2010-01-085-5/+29
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge from trunkJason Rumney2010-01-079-82/+201
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge from trunkJason Rumney2010-01-078-14/+109
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | * Merge from mainline.Katsumi Yamaoka2010-01-262-0/+6
| | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | (vc-path): Mark as obsolete.Dan Nicolaescu2010-01-252-0/+6
| | | | | | | | | | | | | | | | | * Merge from mainline.Katsumi Yamaoka2010-01-2518-51/+152
| | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Fix erc reconnection via non-default connectors (Bug#4958).Chong Yidong2010-01-253-3/+20
* | | | | | | | | | | | | | | | | | (vc-annotate-revision-at-line): Compare fileDan Nicolaescu2010-01-252-1/+5
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | * xfns.c (Fx_create_frame): If frame height is too big, tryJan D.2010-01-252-9/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge from trunkJan D.2010-01-2542-149/+392
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | (vc-bzr-print-log): Use the more compact --line optionDan Nicolaescu2010-01-242-2/+8
* | | | | | | | | | | | | | | | | mergeMark A. Hershberger2010-01-253-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | (vc-git-dir-status-goto-stage): Pass --relative to theEric Hanchrow2010-01-243-1/+8
* | | | | | | | | | | | | | | | | | working version of vc-bzr-revision-tableMark A. Hershberger2010-01-252-1/+17
* | | | | | | | | | | | | | | | | | merge conflictMark A. Hershberger2010-01-2443-288/+381
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Try and fix bug#788, hopefully for real this time.Stefan Monnier2010-01-243-16/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | * keymap.c (shadow_lookup): Add `remap' arg.Stefan Monnier2010-01-243-16/+36
| * | | | | | | | | | | | | | | | | | Use png_sig_cmp to allow linking with libpng 1.4.0.Chong Yidong2010-01-242-7/+12
* | | | | | | | | | | | | | | | | | | replace references to obsolete c-subword-modeMark A. Hershberger2010-01-196-11/+23
| | | * | | | | | | | | | | | | | | | Typo fix.Jan D.2010-01-251-1/+1
| | | * | | | | | | | | | | | | | | | xfns.c (Fx_create_frame): If frame height i stoo big, tryJan D.2010-01-252-9/+22
| | | * | | | | | | | | | | | | | | | Merge from trunkJan D.2010-01-207-150/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * Merge from mainline.Katsumi Yamaoka2010-01-2426-96/+239
| | | | | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove support for adding --signoff on commit.Dan Nicolaescu2010-01-243-19/+7
| * | | | | | | | | | | | | | | | | | (xterm-maybe-set-dark-background-mode): RenameDan Nicolaescu2010-01-242-9/+28
| * | | | | | | | | | | | | | | | | | Add the aliases bug-emacs and bug-gnumacs.Glenn Morris2010-01-241-2/+5
| * | | | | | | | | | | | | | | | | | (aelement): Fix typo in previous.Glenn Morris2010-01-231-3/+3
| * | | | | | | | | | | | | | | | | | Small fixes.Glenn Morris2010-01-231-5/+4
| * | | | | | | | | | | | | | | | | | Fix some details of previous change.Glenn Morris2010-01-231-10/+11
| * | | | | | | | | | | | | | | | | | Update X-Debbugs-CC details.Glenn Morris2010-01-231-20/+38
| * | | | | | | | | | | | | | | | | | * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo (Bug#3541).Chong Yidong2010-01-232-3/+8
| * | | | | | | | | | | | | | | | | | * url-util.el: Require url-vars (Bug#5459).Chong Yidong2010-01-232-0/+5
| * | | | | | | | | | | | | | | | | | * emacs-lisp/assoc.el (aelement): Doc fix.Chong Yidong2010-01-232-1/+3
| * | | | | | | | | | | | | | | | | | * emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).Chong Yidong2010-01-232-7/+12
| * | | | | | | | | | | | | | | | | | Account for utmp.h availability.Chong Yidong2010-01-235-2/+15
| * | | | | | | | | | | | | | | | | | Fix bug#5435: ada-mode; pragma parameter list indented incorrectly.Stephen Leake2010-01-232-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Tweak docstring and comment.Stephen Leake2010-01-231-3/+2
| | * | | | | | | | | | | | | | | | | | Fix bug#5435.Stephen Leake2010-01-212-2/+8
| * | | | | | | | | | | | | | | | | | | * mail/rmail.el: Update autoload checksum.Juanma Barranquero2010-01-231-1/+1
| * | | | | | | | | | | | | | | | | | | * net/tramp-smb.el (tramp-smb-conf): New defcustom.Michael Albinus2010-01-232-2/+15
| * | | | | | | | | | | | | | | | | | | * xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs...YAMAMOTO Mitsuharu2010-01-232-0/+8
| * | | | | | | | | | | | | | | | | | | * net/tramp-imap.el (top): Autoload needed packages.Michael Albinus2010-01-221-1/+0
| * | | | | | | | | | | | | | | | | | | * net/tramp-imap.el (top): Autoload needed packages.Michael Albinus2010-01-222-5/+21
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyteStefan Monnier2010-01-224-2/+14
| * | | | | | | | | | | | | | | | | | * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).Chong Yidong2010-01-222-1/+8
| * | | | | | | | | | | | | | | | | | Fix bug #5447, whereby loading C:/foo.el.gz on MS-Windows would fail.Eli Zaretskii2010-01-222-1/+13