aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
Commit message (Expand)AuthorAgeFilesLines
* (emacs-version): Set back to 22.1.50 following inadvertent bump inGlenn Morris2007-08-291-1/+1
* Update copyright years, update license to GPLv3 or later.Glenn Morris2007-08-291-2/+2
* License should be GPLv3 or later.Glenn Morris2007-08-293-3/+3
* (x-gtk-stock-map): :version changed to 23.1.Jan Djärv2007-08-292-1/+5
* Merge multi-tty branchMiles Bader2007-08-2966-3206/+5068
|\
| * Merge from emacs--devo--0Miles Bader2007-08-295-2/+1451
| |\
| * | Further simplification pending merge to trunk.Glenn Morris2007-08-281-2/+0
| * | Further simplification pending merge to trunk.Glenn Morris2007-08-281-31/+21
| * | Further simplification pending merge to trunk.Glenn Morris2007-08-281-154/+131
| * | Merge from emacs--devo--0Miles Bader2007-08-272-3/+0
| |\ \
| * \ \ Merge from emacs--devo--0Miles Bader2007-08-2772-1548/+4480
| |\ \ \
| * | | | Further simplification pending merge to trunk.Glenn Morris2007-08-271-59/+28
| * | | | crunchDan Nicolaescu2007-08-261-891/+261
| * | | | More fixes for 2007-08-21 merge conflict.Juri Linkov2007-08-241-1/+2
| * | | | loadup.el: Add "button" loading after "faces" and move "startup"Juri Linkov2007-08-231-0/+5
| * | | | Add "button" loading after "faces" and move "startup" to load after "button".Juri Linkov2007-08-231-2/+3
| * | | | Fix 2007-08-21 merge conflicts.Juri Linkov2007-08-221-77/+13
| * | | | Import changelog info from arch logs into ChangeLog.multi-tty filesMiles Bader2007-08-221-3/+888
| * | | | Merge from emacs--devo--0Miles Bader2007-08-2154-1183/+2131
| |\ \ \ \
| * \ \ \ \ Merge from emacs--devo--0Miles Bader2007-08-13143-743/+2400
| |\ \ \ \ \
| * | | | | | Regenerate.Andreas Schwab2007-08-071-960/+1101
| * | | | | | Merge from emacs--devo--0Miles Bader2007-08-0312-59/+172
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge from emacs--devo--0Miles Bader2007-08-0315-102/+303
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from emacs--devo--0Miles Bader2007-07-311040-3966/+4955
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Change NAKAJI Hiroyuki's e-mail address into the generic one in the 2007-02-28Katsumi Yamaoka2007-07-301-1/+1
| * | | | | | | | | * term/xterm.el (terminal-init-xterm): Fix merge issue.Dan Nicolaescu2007-07-292-1/+5
| * | | | | | | | | Merge from emacs--devo--0Miles Bader2007-07-2459-1191/+2985
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge from emacs--devo--0Miles Bader2007-07-15126-8541/+16796
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | *** empty log message ***Dan Nicolaescu2007-07-031-9/+9
| * | | | | | | | | | | * server.el (server-process-filter): Likewise.Dan Nicolaescu2007-07-035-9/+53
| * | | | | | | | | | | (x-menu-bar-open): Use accelerate-menu.Dan Nicolaescu2007-07-022-1/+5
| * | | | | | | | | | | (terminal-init-xterm): Fix previous change.Dan Nicolaescu2007-06-232-1/+5
| * | | | | | | | | | | * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.Dan Nicolaescu2007-06-201-0/+4
| * | | | | | | | | | | (terminal-init-xterm): Revert bad merge from trunk.Dan Nicolaescu2007-06-181-297/+5
| * | | | | | | | | | | Merge from emacs--devo--0Miles Bader2007-06-1663-1197/+2883
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | *** empty log message ***Juanma Barranquero2007-06-121-1/+5
| * | | | | | | | | | | | (server-process-filter): Fix typo in docstring.Juanma Barranquero2007-06-121-1/+1
| * | | | | | | | | | | | Merge from emacs--devo--0Miles Bader2007-06-1145-2328/+6344
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | * term.c (init_tty): Use terminal specific mouse_position_hook.Dan Nicolaescu2007-06-042-1/+5
| * | | | | | | | | | | | | Merge from emacs--devo--0Miles Bader2007-05-3032-200/+550
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from emacs--devo--0Miles Bader2007-05-2512-33405/+33540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from emacs--devo--0Miles Bader2007-05-247-72/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert to official bug report addresses.Miles Bader2007-05-202-2/+5
| * | | | | | | | | | | | | | | | Merged from emacs--devo--0Miles Bader2007-05-2027-1546/+1551
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | server.el: Don't change the default directory in the *scratch* buffer.Miles Bader2007-05-202-2/+5
| * | | | | | | | | | | | | | | | | * loadup.el: Load mac-win on a Mac. Avoid loading both x-win andDan Nicolaescu2007-05-193-86/+90
| * | | | | | | | | | | | | | | | | * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.Dan Nicolaescu2007-05-193-4/+36
| * | | | | | | | | | | | | | | | | *** empty log message ***Jason Rumney2007-05-171-0/+4
| * | | | | | | | | | | | | | | | | (internal-face-interactive): Remove obsolete function.Jason Rumney2007-05-171-27/+0
| * | | | | | | | | | | | | | | | | *** empty log message ***Jason Rumney2007-05-161-0/+8