Parent Directory | Revision Log
Links to HEAD: | (view) (download) (annotate) |
Sticky Tag: |
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-105
Fix typos in comments.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-103
(smerge-remove-props, smerge-refine): Use with-silent-modifications (bug#4342).
Mark face aliases with "-face" suffix as obsolete.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-100
(smerge-start-session): Add interactive spec.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-99
Add 2009 to copyright years.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-97
Require diff-mode at run-time as well.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-94
Make auto-refining a minor mode, and diff- and smerge- use it. * diff-mode.el (diff-auto-refine): Delete defcustom. (diff-auto-refine-mode): New func/var via define-minor-mode. Update var ref to use diff-auto-refine-mode. * smerge-mode.el (diff-mode): Require when compiling. (smerge-auto-refine): Delete defcustom. Update smerge-auto-refine ref to use diff-auto-refine-mode.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-83
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
(smerge-start-session): Revert unintended change in revision 1.69.
Re-fill copyright years. Re-fix permissions notice.
(smerge-command-prefix): Fix custom type.
(smerge-command-prefix): Fix custom type.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-82
Switch to recommended form of GPLv3 permissions notice.
(smerge-start-session): Don't call smerge-next if looking at conflict marker.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-79
(smerge-apply-resolution-patch): Fix typo. (smerge-resolve): Merge the "2-way refinement" case with one half of the "mere whitespace" resolution.
(smerge-apply-resolution-patch): New fun. (smerge-resolve): Add various resolution heuristics.
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-76
(smerge-auto-combine-max-separation): New var. (smerge-auto-combine): New fun.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-70
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
* smerge-mode.el (smerge-start-session): Rename from smerge-auto. * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Rename callers. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): Undo previous change.
(smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command.
* smerge-mode.el (smerge-auto): New function. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode. (top-level): Add a Todo list.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-69
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Add 2008 to copyright years.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-63
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest): * play/yow.el (doctor-ret-or-read): * vc-hooks.el (vc-dired-resynch-file): * vc-hg.el (log-view-get-marked): * smerge-mode.el (ediff-cleanup-mess): * pcvs.el (vc-editable-p, vc-checkout): * pcomplete.el (comint-bol): * informat.el (texinfo-format-refill): * ido.el (tramp-tramp-file-p): * ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier) (ibuffer-generate-filter-groups) (ibuffer-format-filter-group-data): * add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as functions. * ido.el (ido-file-internal): Move with-no-warnings to include the ffap-string-at-point call. * pcomplete.el (pcomplete-executables): Move defsubst before first use. * vc-hg.el (vc-hg-revision-table): Fix last change.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
(smerge-refine-subst): Pass "-d" to diff.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-62
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 899-901) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 129-130) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 259-260) - Merge from emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-61
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-889) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 - Add missing change from rel-22 branch to src/image.c - Remove RCS keywords from doc/misc/cc-mode.texi - Remove man, lispref, and lispintro directories * emacs--multi-tty--0 (base, patch 1-45) - tag of emacs@sv.gnu.org/emacs--devo--0--patch-743 - Merge from lorentey@elte.hu--2004 - Remove out-of-date meta-files - Tweak perms to be more like emacs--devo--0 - Restore lispref/elisp-covers.texi - Sync with sealing patch in lorentey@elte.hu. - Rudimentary fix for environment variable handling. - Update from CVS - server.el: Don't change the default directory in the *scratch* buffer. - Merged from emacs--devo--0 - Revert to official bug report addresses. - Merge from emacs--devo--0 - Import changelog info from arch logs into ChangeLog.multi-tty files - Update from CVS: src/puresize.h (BASE_PURESIZE): Increase. - Restore original arch-tag in src/ChangeLog.multi-tty * emacs--rel--22 (patch 101-121) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 248-256) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: texi/gnus.texi (On Writing Manuals): Fix typos. - Revert refcard location changes * lorentey@elte.hu--2004/emacs--cvs-trunk--0 (base, patch 1-7) - tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474 - Add CVS metadata files. - Update from CVS. - Update from CVS - Sync with miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-539. * lorentey@elte.hu--2004/emacs--cvs-trunk--0- (version 0) - Branch closed. Use miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 instead. * lorentey@elte.hu--2004/emacs--multi-tty--0 (base, patch 1-4) - tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137 - Add a level of indirection to terminal characteristics. - Implemented multiple tty support. - Updating_frame vs. selected_frame in term.c. - Added a pointer to my archive to README.multi-tty * lorentey@elte.hu--2004/emacs--multi-tty--0--patch-5 * lorentey@elte.hu--2004/emacs--multi-tty--0 (patch 6-223, 225-257) - Removed two files that were committed by mistake. - Fixed two typos. - Full support for multiple terminal I/O (with some rough edges). - Fully eliminated global tty state variables. - Cosmetic changes in README.multi-tty - Added compilation instructions to README.multi-tty. - Implemented automatic deletion of terminals. - README.multi-tty updates. - Small change in README.multi-tty - Merged in changes from CVS HEAD - Joined miles@gnu.org--gnu-2004/emacs--cvs-trunk--0 - Trivial changes - Bugfix festival. - Handle Ctl-G in emacsclient. - Make sure secondary frames are deleted when emacsclient quits. - Merged in changes from CVS head - Don't compile sys_select on systems that don't need it. - Delete server frames on server restart. - Undo patch-23. I need a coffee. - Major bugfixes and slight enhancements. - A few more bugfixes and new features. - Separate frame-local, tty-dependent parameters from tty-local parameters. - Fixed X support, preliminary support for X-tty combo sessions. - MULTI_KBOARD support for ttys. Input-related bugfixes for X+tty sessions. - Got rid of the rif (window-based redisplay interface) global variable. - Fix longopts option name for --tty. - Portability fixes (now it compiles & runs fine on Solaris). - Added multi-tty support for talk.el. - Fixed typo in talk.el. - Fixed typo in talk.el (again). - Fix mouse-position for tty+X combo sessions. - Add "multi-tty" to emacs-version output. - Fix more SEGV cases in frame.c - Converted display hooks to be display-local. Plus many bugfixes. - Fix SEGV in init_sys_modes during X startup - Hookified termcap devices, added bootstrap display device, plus many bugfixes. - Numerous bugfixes and small improvements. - Changed tty input code to use read_socket_hook. - Fix C-g handling with multiple ttys. - Don't select on stdin unconditionally. - Support for opening X frames from a tty session. - Fix initialization of the window-system variable. - Romain Francoise's and Ami Fischman's bugfixes. - Added note about the commit mailing list. - Fixed tty faces during combo sessions. Plus other assorted bugfixes. - Set the keyboard of the initial frame correctly. - Fixed interactive temacs. - Removed %T in mode-line-format. Trivial documentation changes. - Fixed unsafe and incorrect use of record_unwind_protect in Fsuspend_emacs. - Cosmetic changes. - Don't exit Emacs when the X display is closed during a tty-X combo session. - Prevent core dumps when the X server crashes. - Fix the case when emacsclient is run on Emacs's controlling tty. - Trivial fixes to shut up some of the compiler warnings. - Don't hang on the tty if called from a shell script. - Fixed a typo in README.multi-tty. - Added newly loaded stuff in loadup.el to src/Makefile.in. - Don't try to init X drag and drop on a termcap frame. - Fix list-colors-display and other functions on a termcap frame - Added -w option to emacsclient for opening a new X frame. - Verify the version of Emacsclient. - Changed emacsclient to open new frames by default. - README updates. - Don't read too many characters from the tty. - Don't delete a tty if it's the last device with frames. - Fix typo in delete_display_hook documentation. - Fix a crash in emacsclient when DISPLAY is unset. - Block more input during read_avail_input. - Allow tty_read_avail_input to use the whole input buffer. - Don't try to handle a new event if the input buffer is full. - Back out previous change, it causes infinite recursion. - Revert patch-93, that was the real culprit. Reapply patch-97. - Check for numchars > 0 in handle_one_xevent, not 1. - (Sigh.) Don't try to read more events than the buffer size. - Make emacsclient refuse to create a frame inside an Emacs term buffer. - Implemented suspending of emacsclient frames. - Added *.rej to tla's unrecognized pattern. - Fix background-mode on terminal frames (Dan Nicolaescu). - Fixed compiler warnings for keyboard.c. - Trivial cleanups to get rid of GCC warnings. - Trivial cleanup in fringe.c, missing from previous patch. - Removed *.rej from backup pattern in tagging method. - Fix cut'n'paste during a multi-display session (Mark Plaksin, Robert Chassell). - Fix dropping of the controlling tty on Solaris (Dan Nicolaescu). - Fix bootstrap problems in CVS. - Fix initialization order at bootstrap (Dan Nicolaescu). - Trivial cosmetic change in dispnew.c. - Prevent Lisp nesting errors while bootstrapping. - Fix #include errors for FreeBSD (Frank Ruell) - Merged in changes from CVS trunk - README changes. - Merged in changes from CVS trunk. - Eliminated updating_frame. - Fix segfault in term.c (reported by lukhas@free.fr). - Another server.el overhaul. - Fix frame parameter handling in server.el. - In emacsclient, protect the xmitted string from fprintf expansion (Dan Nicolaescu). - Fix error on deleting an emacsclient terminal (Dan Nicolaescu). - Fix one more case of the previous error. - A simple implementation for display-local frame parameters. - Mention `tla replay' in README.multi-tty (Gaute Strokkenes). - Fixed environment variable handling during terminal initialization. - Added branch description to admin/notes/BRANCH. - Fix fatal error during startup (rep. by Friedrich Delgado Friedrichs) - Add kludge to prevent overriding keyboard-coding-system customization. - Make terminal_coding and keyboard_coding display-local. - New control structure: with-selected-frame. - Use with-selected-frame. - Fix environment variables on emacsclient frames. - Use the remote locale for terminal & keyboard coding system. - Update README.multi-tty. - Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs). - Fix terminal coding system in multibyte locales (rep. by Friedrich Delgado Friedrichs). - Fix background mode initialization on client tty frames (rep. by Dan Nicolaescu). - Fix window-system-default-frame-alist (ARISAWA Akihiro). - Don't ignore SIGWINCH under X (contributed by Yoshiaki Kasahara). - Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara). - Fix SEGV on terminals without 'IC' capability (Yoshiaki Kasahara). - README.multi-tty update. - Clear single_kboard each time Emacs returns to top-level. - Don't core dump on SIGINT when there is no frame on the controlling tty. - Dissociate from the controlling tty correctly on FreeBSD. - Make server-start safe against accidental restarts. - Fix parse error in term.c (ARISAWA Akihiro). - Fix byte-compile errors during bootstrap. (Reported by Juraj Kubelka.) - Fix --no-wait in emacsclient (reported by Dan Nicolaescu). - Reapply src/Makefile.in changes that got lost in the tagline snafu of patch-197. - Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes. - Fix bootstrap errors. - Fixed C-c from the controlling terminal. - Don't leave buffers created by nowait clients buried under others (rep. by Dan Nicolaescu). - Fix suspend-frame on the controlling tty (reported by Dan Nicolaescu). - Fix Viper with simultaneous X and tty display devices. (Rep. by IRIE Tetsuya.) - Prevent the previous bug from reappearing later. - Fix creating frames on different X servers. - Cleaned up README compile & test instructions. - Updated archive location in docs. (Thanks to Dan Waber.) - README updates, including a new Tips & Tricks section - Change binding of C-x C-c to only exit emacsclient, not Emacs itself. - Fix typo in server.el (Han Boetes, Ted Morse, Ami Fischman) - Add TAGS-LISP to precious regex in src/. - Merged in changes from CVS trunk (Jan D. has fixed the XSync call in xterm.c, no need to disable it anymore). - Inhibit redisplay while frames are being deleted after an X disconnect. - Fix typo in src/Makefile.in. - Removed C99ism in init_fringe_bitmap. - Small tweaks in server.el. - Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.) * lorentey@elte.hu--2004/emacs--multi-tty--0 (patch 258-292) - Merged in changes from CVS trunk. - Fix core dump in redisplay window. (Reported by Yoshiaki Kasahara.) Plus cleanups. - Fix bootstrap problem with --without-x. - Trivial documentation change in keyboard.c. - Remove remaining references to updating_frame. - Increase PURESIZE to handle the extra stuff recently added. - Trivial changes in x_create_tip_frame. - README update. - Joined Miles's 2005 Emacs branch. - Merged in changes from CVS trunk. (Long time no see!) :-) - Fix bootstrap error in CVS. - Fix xassert-related bootstrap errors. - Add some new precious/backup patterns in src/. - Update =partner-versions. - Prevent emacsclient errors when Emacs is compiled without X support. - README updates. (Reported by Xavier Mallard) - Merged from miles@gnu.org--gnu-2005 (patch 76-78) - Fix typo in dispnew.c. - Merged from miles@gnu.org--gnu-2005 (patch 12-13, 79-90) - On C-x C-c, restrict `save-some-buffers' to the client's buffers. (Reported by Han Boetes.) - Fix compilation error with GTK, fix issues with double C-g on controlling tty. (Reported by Friedrich Delgado Friedrichs, Yoshiaki Kasahara.) * lorentey@elte.hu--2004/emacs--multi-tty--0 (patch 293-605) - Merged from miles@gnu.org--gnu-2005 (patch 91-94) - Initialize blink-cursor-mode consistently. - Merged from miles@gnu.org--gnu-2005 (patch 14-16, 95-106) - Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116) - Fix line/column number positioning in emacsclient. (Reported by Han Boetes.) - Merged from miles@gnu.org--gnu-2005 (patch 117-118) - Merged from miles@gnu.org--gnu-2005 (patch 119) - Merged from miles@gnu.org--gnu-2005 (patch 27, 120-125) - Merged from miles@gnu.org--gnu-2005 (patch 28-30, 126-128) - Merged from miles@gnu.org--gnu-2005 (patch 31-33, 129-141) - Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158) - Fix crash condition when an X server connection is broken. (Reported by Vincent Bernat.) - Declare Vinhibit_redisplay in xterm.c. - Don't abort with GTK when a tty is opened. - Merged from miles@gnu.org--gnu-2005 (patch 159) - Merged from miles@gnu.org--gnu-2005 (patch 160-161) - Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182) - Merged from miles@gnu.org--gnu-2005 (patch 183) - Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191) - Close the X connection when the last frame is deleted. - Fix stupid syntax errors in previous patch. - README updates. - Revert changes that were committed by mistake in the previous patch. - Merged from miles@gnu.org--gnu-2005 (patch 192-203) - Fix some superflous deviations from CVS, plus apply some cosmetics. - Fix yet another compilation error. - Merged from miles@gnu.org--gnu-2005 (patch 204-213) - Fix some aspects of X display shutdown. - Prevent core dump when connection is lost during frame creation. - README update. (Fix identifier names in emacs background preloader example.) - Fix error when creating tty clients. - Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231) - Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239) - Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245) - Resolve crashes related to face aliases. - Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265) - Fix bootstrap error during loadup. - Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268) - Merged from miles@gnu.org--gnu-2005 (patch 269) - Merged from miles@gnu.org--gnu-2005 (patch 67, 270-278) - Fix describe-variable with frame-local variables. - I give up; attempt to fix annoying crashes by reverting xdisp.c changes in patch-328. - Merged from miles@gnu.org--gnu-2005 (patch 279-280) - Merged from miles@gnu.org--gnu-2005 (patch 281-285) - Fix exponential slowdowns on repeated tty frame creation. - Fix UTF-8 tty input when first frame is an X frame. Steps towards multiple tty locale support. - Fix typo in get_display. - Support for ttys with different character locale settings. - Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291) - Merged from miles@gnu.org--gnu-2005 (patch 292-295) - Disable display type check in start_hourglass, and always set up the timer. - Merged from miles@gnu.org--gnu-2005 (patch 296-306) - Speed up `emacsclient -t' on xterms. (by suggestion of Dan Nicolaescu) - Merged from miles@gnu.org--gnu-2005 (patch 307-312) - Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319) - Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331) - Merged from miles@gnu.org--gnu-2005 (patch 74-79, 332-349) - Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422) - Merged from miles@gnu.org--gnu-2005 (patch 423-434) - Merged from miles@gnu.org--gnu-2005 (patch 435-437) - Merged from miles@gnu.org--gnu-2005 (patch 438-440) - Merged from miles@gnu.org--gnu-2005 (patch 441-446) - Make function-key-map a terminal-local variable (move it inside the kboard struct). - Update Lisp code for a terminal-local `function-key-map'. - Make sure the terminfo function key sequences are set up in the correct function-key-map. - Work around mysterious breakage of arrow key recognition under screen (see first TODO in README). - Change key-translation-map to be terminal-local. - Merged from miles@gnu.org--gnu-2005 (patch 447-448) - Replace encoded-kbd-mode with display-specific encoded-kbd-setup-display. (Doesn't work yet.) - New version of ldefs-boot.el. - Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display. - New C function `push_display_kboard'. - Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.) - Use terminal-local-value to access function-key-map in terminal packages. - Speed up loading of term/xterm.el. - Speed up loading of term/xterm.el (Dan Nicolaescu). - Remove pointless conditional around key substitution block in term/xterm.el (Dan Nicolaescu) - Fix the original cause of the "arrow keys don't work on screen" bug. - Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468) - Merged from miles@gnu.org--gnu-2005 (patch 469) - Implement rudimentary Lisp-level terminal parameters. - Small enhancements. - Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice. - Merged from miles@gnu.org--gnu-2005 (patch 470-473) - Merged from miles@gnu.org--gnu-2005 (patch 474) - Fix compilation error in src/term.c. - At long last, fix annoying SELECTED_FRAME crashes after unexpected connection failures. Yay! - README update. - Rename term_init to init_tty. - Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly. - Cosmetic changes in server.el. - Fix compilation error in select_frame_for_redisplay. - Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map. - Fix dumb error leading to national keys not working on ttys. - Fix broken emacsclient resume on Solaris (by Dan Nicolaescu). - Don't let window-system-default-frame-alist override parameters specified manually. - Work around crashes in X session management after normal shutdown of X server. - Apply patch from CVS trunk to fix recenter on ttys. - Add two pending bugs to README.multi-tty. - Merged in changes from CVS trunk. Plus added lisp/term tweaks. - Fix syntax error in lisp/term/xterm.el. - Merged in changes from CVS trunk. (Testing my own CVS gateway.) - Add =upstream-branch file for semi-automated merges. - Merged in changes from lorentey@elte.hu--2004/emacs--cvs-trunk--0 - Fix terminal initialization code. (Contributed by Dan Nicolaescu.) - Slightly refactor the terminal initialization code for simplicity. - Apply settings in `window-system-default-frame-alist' to the initial frame as well. - Prevent resource allocation explosion when C-x 5 2 is used on xterms. - Enforce the presence of `window-system' and `tty-type' frame parameters in all frames. - Fix function-key-map massaging vs `C-x 5 2' in lisp/term/*.el. (Submitted by Dan Nicolaescu.) - Merged in changes from CVS trunk. - Fix bootstrap error. - Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server. - Fix `emacsclient +12 file' behaviour. (Reported by Han Boetes.) - Make xt-mouse.el multi-tty-compatible. - Fix crashes in xdialog_show (and other places) with xterm-mouse-mode. - Make `emacsclient -n <filename>' open new X frames when possible. (Reported by Bas Kok.) - Don't let server-save-buffers-kill-display unexpectedly kill Emacs on --no-wait's X frames. - Set Emacs version number to 22.0.51 to allow parallel installations of CVS trunk and the multi-tty branch. - Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.) - Fix bootstrap error in keyboard.c. - Switch upstream to miles@gnu.org--gnu-2005/emacs--cvs-trunk--0. - Fix assertion on kboard->kbd_queue and other such crashes. - Merged from miles@gnu.org--gnu-2005 (patch 115, 540-542) - Merged from miles@gnu.org--gnu-2005 (patch 543) - Merged from miles@gnu.org--gnu-2005 (patch 116-117, 544-550) - Fix hardcoded stdout usage in term.c. (Reported by Dan Nicolaescu.) - Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577) - Merged from miles@gnu.org--gnu-2005 (patch 578-592) - Merged from miles@gnu.org--gnu-2005 (patch 593-595) - Merged from miles@gnu.org--gnu-2005 (patch 133-141, 596-609) - Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.) - Change the "pretest" bug report address to the multi-tty list. - Merged from miles@gnu.org--gnu-2005 (patch 610-614) - Doc update. - Change `keyboard-translate-table' to be terminal-local. - Don't try to rebind the `t' symbol. - Protect keyboard-translate-table from GC. - Fix semantics of terminal-local variables. Remove `terminal-local-value' hack. - Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628) - Update frames-on-display-list to accept terminal id numbers. - Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641) - Fix some of the bootstrap problems. - Increase puresize. (Emacs needs 1205176 pure bytes now.) - Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654) - Merged from miles@gnu.org--gnu-2005 (patch 655) - Increase PURESIZE yet again. - Store client's environment in terminal parameters, not server parameters. - Merged from miles@gnu.org--gnu-2005 (patch 656-658) - Merged from miles@gnu.org--gnu-2005 (patch 659-663) - Delete leftover id for "info/dir". - Fix "first non-ASCII character on new tty frames" problem. - Prevent core dumps with GTK by disabling secondary X connections there. - Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann) - Fix typo in previous commit. - Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676) - Implement full support for frame-local `next-buffer' and `previous-buffer'. - Reimplement and extend support for terminal-local environment variables. - Don't let x_initialize break 8-bit input on ttys. (Reported by Joakim Verona.) Split `set-input-mode'. - Pull a bugfix from CVS to prevent problems with the Debian semantic package. - Fix compilation error during non-X builds. - Reimplement terminal parameters in C; clean up term.c, create terminal.c. - Implement automatic terminal-local environment variables via `local-environment-variables'. - Fix compilation errors in previous commit. - Merged from miles@gnu.org--gnu-2005 (patch 677) - Fix error during bootstrap. - Fix semantics of let-binding `process-environment'. - Initialize Vprocess_environment to nil. - Store local environment in frame (not terminal) parameters. - Merged from miles@gnu.org--gnu-2005 (patch 678-680) - Merged from miles@gnu.org--gnu-2005 (patch 681) - Update environment-related doc strings. - Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly. - Set `local-environment-variables' to t by default. - Show the splash screen on Emacsclient frames. Show *scratch* by default. - Display "@" in mode-lines of Emacsclient frames. - Make sure `delete-frame-functions' can not prevent the frame from being deleted. - Fix crash in lookup_image on termcap frames. - Enhance splash screens to work better with emacsclient. - Fix splash screen loosing input events on Emacsclient frames. - Don't display the splash screen when no frame was created. (Fixes tty resume.) - (Hopefully) fix bootstrap error on OpenBSD. (reported by Han Boetes) - Fix typo in docstring of `frame-with-environment'. - Cosmetic fixes in xfns.c. - Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2" - Make all frames created in an emacsclient session belong to that client. - Experimental change: don't restore kboard after temporary changes if Emacs wasn't in single kboard state. - Fix typo in `server-handle-delete-frame'; fix startup echo area message. - Fix last frame check in server.el. - Fix Delete keys under X (for good, this time). - Overhaul and simplify single_kboard API. Allow calls to `recursive-edit' in process filters. Small fixes. - Merged from miles@gnu.org--gnu-2005 (patch 682) - Fix abort() in read_key_sequence. - Remove group write permissions from all files. - Merged from miles@gnu.org--gnu-2005 (patch 683-684) - Fix C-g during `make-network-process'. (Reported by Mark Plaksin.) - Merged from miles@gnu.org--gnu-2005 (patch 174-181, 685-690) - Merged from miles@gnu.org--gnu-2005 (patch 182-184, 691-699) - Merged from miles@gnu.org--gnu-2005 (patch 185-186, 700-703) - Fix bootstrap problem reported by Han Boetes. - Fix some bugs related to wrong_kboard_jmpbuf. - Eliminate wrong_kboard_jmpbuf. - Merged from miles@gnu.org--gnu-2005 (patch 187, 704) - Fix compilation error on older GCCs (reported by "mace"). - Merged from - Fix bootstrapping problem. (Reported by "mace".) - Merged from emacs@sv.gnu.org - Add explicit abort() when x_catch_errors_unwind is called by mistake. - Fix `emacsclient --eval '(progn (find-file "file")'' and the like. (Reported by Han Boetes.) - Fix permissions. (Reported by Han Boetes.) - Fix tty state problem after error in `set-quit-char'. - Fix compilation. - Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.) - Increase puresize. - Fix bogus crash with -DENABLE_CHECKING. - Remove unused variable in read_key_sequence. - Fix GDB magic. - Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.) - Fix ediff problems. (Reported by Dan Nicolaescu.) - Fix compilation error in ediff-wind.el. D'oh. - Fix bizarre syntax error, probably from a baz merge bug. - Let the Emacs server recognize `inhibit-startup-echo-area-message'. (Reported by Han Boetes.) - Set emacsbug.el's pretest address to the multi-tty list. (Reported by Richard Lewis.) - Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.) - Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame. - Clean up tty device handling. Change name of controlling tty from nil to "/dev/tty". - Set `default-directory' in *scratch* to the current directory of emacsclient. - Fix compilation error on OpenBSD. (Reported by Han Boetes.) - Fix OpenBSD compilation some more. (Fix by Han Boetes.) - Fix delete key after C-x 5 2 on X. (Catched by Dan Nicolaescu.) - Fix tooltip border color. - Fix previous commit. - (Attempt to) fix bootstrap error. - Fix typo in startup.el. - Fix `vc-annotate' under X. (Reported by Dan Nicolaescu.) - Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.) - Fix stupid crash during startup. - Fix crashes in redisplay functions on suspended tty frames. (Reported by Dan Nicolaescu.) - Fix crashes in `delete-terminal' caused by recursive calls or X displays with live frames. - Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal. - Fix and/or simplify terminal initialization files. - Fix C-x 5 2 on the controlling tty; fix some possible crash conditions and a memory leak. - Fix syntax errors in terminal initialization files. - Fix compilation error in lwlib/xlwmenu.c. - Rework environment variable support. (Reported by Kalle Olavi Niemitalo and Noah Friedman.) - Merged from emacs@sv.gnu.org. - Fix typo in lisp/term/xterm.el. - Let frames on new terminals inherit 'environment and 'client. - Fix x_catch_errors-related abort after X disconnects. (Reported by Dan Nicolaescu). - Fix F10 behaviour. (Reported by Bernard Adrian.) - Remove superfluous properties from the mode-line-client indicator. (Reported by Kalle Olavi Niemitalo) - Fix various aborts in get_named_tty. (Patch by Kalle Olavi Niemitalo) - Increase PURESIZE. - Fix obvious runtime errors after merge. - Regenerate lisp/ldefs-boot.el. - Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned! - Fix crash in window.c. - Fix various suspend-related bugs in emacsclient. (Report & patch by Dan Nicolaescu.) - Remove semantic.cache, fix tagging method. - Fix compilation errors. Regenerate ldefs-boot.el. - Re-enable GTK multidisplay support. - Regenerate ldefs-boot, remove junk. - Fix compilation error with non-toolkit scrollbar. * lorentey@elte.hu--2004/emacs--multi-tty--0- (version 0) - This branch is now closed. Work continues at emacs@sv.gnu.org/emacs--multi-tty--0. Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-56
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 852-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 93-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-55
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-838) - Update from CVS - Merge from emacs--rel--22 - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Restore lisp/emacs-lisp/cl-loaddefs.el * emacs--rel--22 (patch 70-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-53
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
* term/x-win.el (x-gtk-stock-map, icon-map-list) (x-gtk-map-stock): Delete duplicated definitions from merge. * progmodes/octave-mod.el: Require octave-inf at compile time * progmodes/compile.el (compilation-skip-to-next-location) (compilation-skip-threshold, compilation-skip-visited): Move definitions earlier. * play/zone.el (zone-fall-through-ws): * play/landmark.el (lm-move-down, lm-move-up): * play/handwrite.el (handwrite): * mail/mspools.el (mspools-visit-spool): * wdired.el (wdired-next-line, wdired-previous-line): * tar-mode.el (tar-subfile-save-buffer): * scroll-lock.el (scroll-lock-next-line) (scroll-lock-previous-line): * image-dired.el (image-dired-next-line) (image-dired-previous-line): * ediff-help.el (ediff-help-message-line-length): Use forward-line. * smerge-mode.el (smerge-auto-refine): * diff-mode.el (diff-auto-refine): Add :group. * play/yow.el: Require doctor at compile time. * vmsproc.el: Provide vmsproc. (command-send-input): Use forward-line. * vms-patch.el: Require ps-print and vmsproc at compile time. * vc-mtn.el (log-view-message-re, log-view-file-re) (log-view-font-lock-keywords): Pacify byte-compiler. * vc-hg.el: Require log-view at compile time.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 901) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-273
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 899-900) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 129-130) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 259-260) - Merge from emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272
(smerge-auto-refine): New var. (smerge-next, smerge-prev): Use it. (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
Add word-granularity refinement. (smerge-refine-forward-function, smerge-refine-ignore-whitespace) (smerge-refine-weight-hack): New vars. (smerge-refine-forward): New fun. (smerge-refine-chopup-region, smerge-refine-highlight-change): Use them. (smerge-refine-subst): Use them as well. Preserve point.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
(smerge-refine-chopup-region): Add `preproc' argument. (smerge-refine-highlight-change): Add `props' argument. (smerge-refine-subst): New function holding most of smerge-refine. (smerge-refine): Use it.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 852-856) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 93-96) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 852-856) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 93-96) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-249
Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 93-96) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-856
(smerge-resolve): New arg `safe'. (smerge-resolve-all, smerge-batch-resolve): New function. (smerge-refine): Make sure `diff' returns the expected result. (smerge-parsep-re): New const. (smerge-mode): Use it to adjust paragraph-separate.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-838) - Update from CVS - Merge from emacs--rel--22 - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Restore lisp/emacs-lisp/cl-loaddefs.el * emacs--rel--22 (patch 70-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-831) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 70-74) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Switch license to GPLv3 or later.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 662-670) - Update from CVS - Fix read-only prompt problem in isearch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 207-208) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-43
Merge from emacs--unicode--0 Patches applied: * emacs--devo--0 (patch 662-669) - Update from CVS - Fix read-only prompt problem in isearch - Merge from gnus--rel--5.10 * emacs--unicode--0 (patch 184) - Merge from emacs--devo--0 * gnus--rel--5.10 (patch 207-208) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-58
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 662-669) - Update from CVS - Fix read-only prompt problem in isearch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 207-208) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
(smerge-remove-props): Don't mark the buffer modified. (debug-ignored-errors): Add entry from smerge-match-conflict.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-39
Merge from emacs--unicode--0 Patches applied: * emacs--devo--0 (patch 586-621) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * emacs--unicode--0 (patch 161-166) * gnus--rel--5.10 (patch 186-199) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-53
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Add 2007 to copyright years.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 239-258) - Update from CVS - (Ffield_beginning, find_field): Undo change of 2006-04-23. - Rcirc patch from Ryan Yeske - Merge from gnus--rel--5.10 - Clean up lisp/gnus/ChangeLog a bit * gnus--rel--5.10 (patch 91-98) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-20
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 43-57) - Update from CVS - Merge from erc--emacs--0 - Make constrain-to-field notice overlays - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 18-21) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-5
Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 620-639) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords. * gnus--rel--5.10 (patch 147-151) - Update from CVS - Merge from emacs--cvs-trunk--0 Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-59
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-53 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 556-561) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-2 Merge from emacs--unicode--0 Patches applied: * emacs--devo--0 (patch 204-273) - Update from CVS - Sync from erc--emacs--0 - Merge from gnus--rel--5.10 - Improve tq.el. - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo. - (Ffield_beginning, find_field): Undo change of 2006-04-23. - Rcirc patch from Ryan Yeske - Clean up lisp/gnus/ChangeLog a bit - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t - Rename "field-at-point" to "field-at-pos" - (comint-insert-input): Remove redundant calls to setq and goto-char * emacs--unicode--0 (patch 56-60) - Merge from emacs--devo--0 - Update from CVS * gnus--rel--5.10 (patch 81-100) - Update from CVS - Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 239-258) - Update from CVS - (Ffield_beginning, find_field): Undo change of 2006-04-23. - Rcirc patch from Ryan Yeske - Merge from gnus--rel--5.10 - Clean up lisp/gnus/ChangeLog a bit * gnus--rel--5.10 (patch 91-98) - Merge from emacs--devo--0 - Update from CVS
Update my email address.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 43-57) - Update from CVS - Merge from erc--emacs--0 - Make constrain-to-field notice overlays - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 18-21) - Update from CVS - Merge from emacs--devo--0
Update years in copyright notice; nfc.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 616-696) - Add lisp/mh-e/.arch-inventory - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords. - lisp/gnus/ChangeLog: Remove duplicate entry * gnus--rel--5.10 (patch 147-181) - Update from CVS - Merge from emacs--cvs-trunk--0 - Update from CVS: lisp/mml.el (mml-preview): Doc fix. - Update from CVS: texi/message.texi: Fix default values. - Update from CVS: texi/gnus.texi (RSS): Addition.
sync with trunk
Update from HEAD
Add 'tools' to file keywords.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 556-561) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-50 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 532-541) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 112-115) - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-48 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 519-530) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 106-111) - Merge from emacs--cvs-trunk--0 - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 532-541) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 112-115) - Update from CVS
(smerge-resolve): Pass args to smerge-remove-props.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 519-530) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 106-111) - Merge from emacs--cvs-trunk--0 - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-47 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 514-518) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 104-105) - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-45 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 493-503) - Update from CVS - Update from CVS: lisp/startup.el (command-line): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 95-98) - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-42 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 459-473) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 86-87) - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 514-518) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 104-105) - Update from CVS
(smerge-refined-change): Add :group.
(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
(smerge-basic-map): Bind smerge-combine-with-next. (smerge-auto-leave): Make undo re-enable the mode. (debug-ignored-errors): Add the user-error of impossible resolution. (smerge-resolve): Move things around a bit, in preparation for later. (smerge-diff): Don't fail if the buffer has no associated file. (ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler. (smerge-conflict-overlay): New function. (smerge-match-conflict): Don't add text properties here. (smerge-find-conflict): Instead, add an overlay here. Also check for the case where we're inside a conflict already, so as to obviate the need for font-lock-multiline, which is unbearably slow with large conflicts and ciomplex font-lock patterns. (smerge-remove-props): Remove overlay rather than text-properties. (smerge-mode): Don't set font-lock-multiline. Remove overlays when turned off.
Update years in copyright notice; nfc.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 493-503) - Update from CVS - Update from CVS: lisp/startup.el (command-line): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 95-98) - Update from CVS
(smerge-ediff): Use insert-buffer-substring.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 459-473) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 86-87) - Update from CVS
Update FSF's address.
(smerge-mode): Add duplicate defvar near top.
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-38 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 423-433) - Update from CVS - Remove "-face" suffix from gnus faces - Remove "-face" suffix from MH-E faces - Remove "-face" suffix from cc-mode faces - Remove "-face" suffix from eshell faces - Remove "-face" suffix from ediff faces
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-36 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 358-400) - Update from CVS - Remove "-face" suffix from widget faces - Remove "-face" suffix from custom faces - Remove "-face" suffix from change-log faces - Remove "-face" suffix from compilation faces - Remove "-face" suffix from diff-mode faces - lisp/longlines.el (longlines-visible-face): Face removed - Remove "-face" suffix from woman faces - Remove "-face" suffix from whitespace-highlight face - Remove "-face" suffix from ruler-mode faces - Remove "-face" suffix from show-paren faces - Remove "-face" suffix from log-view faces - Remove "-face" suffix from smerge faces - Remove "-face" suffix from show-tabs faces - Remove "-face" suffix from highlight-changes faces - Remove "-face" suffix from and downcase info faces - Remove "-face" suffix from pcvs faces - Update uses of renamed pcvs faces - Tweak ChangeLog - Remove "-face" suffix from strokes-char face - Remove "-face" suffix from compare-windows face - Remove "-face" suffix from calendar faces - Remove "-face" suffix from diary-button face - Remove "-face" suffix from testcover faces - Remove "-face" suffix from viper faces - Remove "-face" suffix from org faces - Remove "-face" suffix from sgml-namespace face - Remove "-face" suffix from table-cell face - Remove "-face" suffix from tex-mode faces - Remove "-face" suffix from texinfo-heading face - Remove "-face" suffix from flyspell faces - Remove "-face" suffix from gomoku faces - Remove "-face" suffix from mpuz faces
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 425-445) - Remove "-face" suffix from gnus faces - Update from CVS - Remove "-face" suffix from MH-E faces - Remove "-face" suffix from cc-mode faces - Remove "-face" suffix from eshell faces - Remove "-face" suffix from ediff faces - Implement tty vertical-divider face - Rename vertical-divider face to vertical-border - Change escape-glyph color on dark backgrounds back to cyan - Update reference to renamed Buffer-menu-buffer face
(smerge-ensure-match): Don't use `format' on `error' arguments.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 358-423) - Update from CVS - Remove "-face" suffix from widget faces - Remove "-face" suffix from custom faces - Remove "-face" suffix from change-log faces - Remove "-face" suffix from compilation faces - Remove "-face" suffix from diff-mode faces - lisp/longlines.el (longlines-visible-face): Face removed - Remove "-face" suffix from woman faces - Remove "-face" suffix from whitespace-highlight face - Remove "-face" suffix from ruler-mode faces - Remove "-face" suffix from show-paren faces - Remove "-face" suffix from log-view faces - Remove "-face" suffix from smerge faces - Remove "-face" suffix from show-tabs faces - Remove "-face" suffix from highlight-changes faces - Remove "-face" suffix from and downcase info faces - Remove "-face" suffix from pcvs faces - Update uses of renamed pcvs faces - Tweak ChangeLog - Remove "-face" suffix from strokes-char face - Remove "-face" suffix from compare-windows face - Remove "-face" suffix from calendar faces - Remove "-face" suffix from diary-button face - Remove "-face" suffix from testcover faces - Remove "-face" suffix from viper faces - Remove "-face" suffix from org faces - Remove "-face" suffix from sgml-namespace face - Remove "-face" suffix from table-cell face - Remove "-face" suffix from tex-mode faces - Remove "-face" suffix from texinfo-heading face - Remove "-face" suffix from flyspell faces - Remove "-face" suffix from gomoku faces - Remove "-face" suffix from mpuz faces - Merge from gnus--rel--5.10 - Remove "-face" suffix from Buffer-menu-buffer face - Remove "-face" suffix from antlr-mode faces - Remove "-face" suffix from ebrowse faces - Remove "-face" suffix from flymake faces - Remove "-face" suffix from idlwave faces - Remove "-face" suffix from sh-script faces - Remove "-face" suffix from vhdl-mode faces - Remove "-face" suffix from which-func face - Remove "-face" suffix from cperl-mode faces - Remove "-face" suffix from ld-script faces - Fix cperl-mode font-lock problem - Tweak which-func face * gnus--rel--5.10 (patch 80-82) - Merge from emacs--cvs-trunk--0 - Update from CVS
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375 Remove "-face" suffix from smerge faces 2005-06-10 Miles Bader <miles@gnu.org> * lisp/smerge-mode.el (smerge-mine, smerge-other, smerge-base) (smerge-markers): Remove "-face" suffix from face names. (smerge-mine-face, smerge-other-face, smerge-base-face) (smerge-markers-face): New backward-compatibility aliases for renamed faces. (smerge-mine-face, smerge-other-face, smerge-base-face) (smerge-markers-face): Use renamed smerge faces.
Merged from HEAD
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 228-240) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 53-58) - Merge from emacs--cvs-trunk--0 - Update from CVS - Collapse feature addition/removal within single ChangeLog entry
Revision: miles@gnu.org--gnu-2005/emacs--lexbind--0--patch-27 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 231-240) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 56-58) - Update from CVS - Collapse feature addition/removal within single ChangeLog entry
* mh-customize.el (mh-speedbar-selected-folder-face): Special case high number of colors displays. * textmodes/table.el (table-cell-face): Add special case for displays supporting a high number of colors. * progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face) (vhdl-font-lock-reserved-words-face) (vhdl-speedbar-architecture-face) (vhdl-speedbar-instantiation-face) (vhdl-speedbar-architecture-selected-face) (vhdl-speedbar-instantiation-selected-face): Likewise. * progmodes/sh-script.el (sh-heredoc-face): Likewise. * progmodes/idlw-help.el (idlwave-help-link-face): Likewise. * progmodes/ebrowse.el (ebrowse-tree-mark-face) (ebrowse-root-class-face, ebrowse-member-attribute-face) (ebrowse-progress-face): Likewise. * progmodes/compile.el (compilation-info-face): Likewise. * progmodes/cc-fonts.el (c-invalid-face): Likewise. * emacs-lisp/re-builder.el (reb-match-3): Likewise. * calendar/calendar.el (diary-face): Likewise. * woman.el (woman-italic-face, woman-bold-face) (woman-unknown-face): Likewise. * wid-edit.el (widget-button-pressed-face): Likewise. * whitespace.el (whitespace-highlight-face): Likewise. * smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise. * pcvs-info.el (cvs-marked-face): Likewise. * info.el (info-xref): Likewise. * ido.el (ido-subdir-face, ido-indicator-face): Likewise. * hilit-chg.el (highlight-changes-face) (highlight-changes-delete-face): Likewise. * hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b) (hi-red-b): Likewise. * generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise. * font-lock.el (font-lock-keyword-face) (font-lock-function-name-face, font-lock-warning-face): Likewise. * cus-edit.el (custom-invalid-face, custom-modified-face) (custom-set-face, custom-changed-face, custom-variable-tag-face) (custom-group-tag-face-1, custom-group-tag-face): Likewise. * comint.el (comint-highlight-prompt): Likewise.
(smerge-mode): Specify :group.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS
Revision: miles@gnu.org--gnu-2004/emacs--lexbind--0--patch-31 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-262 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-269 Update from CVS
(smerge-diff-switches): Fix typo in docstring.
Revision: miles@gnu.org--gnu-2004/emacs--lexbind--0--patch-27 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-215 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-239 Update from CVS
Sync to HEAD
(smerge-match-conflict): Fix last change.
(smerge-match-conflict): Try to do something sensible for nested conflict markers. (smerge-find-conflict): Better handle errors in smerge-match-conflict.
(smerge-popup-context-menu): Use it.
Revision: miles@gnu.org--gnu-2004/emacs--lexbind--0--patch-13 Merge from emacs--cvs-trunk Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-162 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-163 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-164 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-165 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-166 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-167 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-168 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-169 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-170 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-171 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-172 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-173 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-174 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-175 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-176 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-177 Update from CVS
(smerge-mode-menu): Fix activate pred for resolve. (smerge-context-menu-map): Remove unused var. (smerge-keep-all): Preserve markers. (smerge-keep-n): New fun. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-ediff): Use it. (smerge-kill-current): Use it. Make it work on some 3-part conflicts. (smerge-popup-context-menu): Also use context-menu on 3-part conflicts. (smerge-resolve): Resolve trivial 3-part conflicts.
Revision: miles@gnu.org--gnu-2004/emacs--lexbind--0--patch-11 Merge from emacs--cvs-trunk Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-138 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-139 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-140 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-141 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-142 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-143 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-144 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-145 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-146 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-147 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-148 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-149 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-150 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-151 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-152 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-153 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-154 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-155 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-156 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-157 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-158 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-159 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-160 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-161 Update from CVS
(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
2004-03-15 Masatake YAMATO <jet@gyve.org> Added context menu support in smerge mode. Most of the part is written by Stefan Monnier. * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New keyman and menu. (smerge-text-properties): New function. (smerge-remove-props): New function. (smerge-popup-context-menu): New function. (smerge-resolve): Call `smerge-remove-props'. (smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto. (smerge-keep-current): Ditto. (smerge-kill-current): New function. (smerge-match-conflict): Detect the file as `a same-diff conflict' if the filename is "ANCESTOR". Put text properties.
(smerge-check-cache, smerge-check): New var and fun. (smerge-mode-menu): Use it to deactivate menu entries. (smerge-keep-current): New fun. (smerge-keep-current): Use it.
Update from arch emacs--lexbind branch
Previous change was bogus. Something odd in pcl-cvs...
Comment.
Add arch taglines
Update from trunk.
Trailing whitespace deleted.
(smerge-ediff): Autoload. (smerge-match-conflict): Don't assume as much about smerge-begin-re. (smerge-resolve-function): New var. (smerge-resolve): New command. (smerge-basic-map): Bind it.
(smerge-ediff): Autoload.
(smerge-ediff): Add name-{mine,other,base} args.
(smerge-diff-buffer-name): Default to *vc-diff*. (smerge-combine-with-next): New function. (smerge-diff): Don't output `wrote /tmp/foo' messages. Insert message if no diffs were found.
Use find-file-hook instead of find-file-hooks.
(smerge-match-conflict): Fix typo. (smerge-diff): Be careful to read match-data early enough.
(smerge-match-conflict): Fix typo. (smerge-diff): Be careful to read match-data early enough.
(smerge-mode): Check if `font-lock-mode' is bound before accessing it.
(smerge-mode): Force font-lock-multiline to t.
(font-lock-keywords, font-lock-mode): Don't bind, just declare.
(smerge-font-lock-keywords): Relax submatch 1.
*** empty log message ***
(smerge-basic-map): Use `=' rather than `d'. Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^. (smerge-mode): Don't assume font-lock doesn't move point.
(smerge-basic-map): Use `=' rather than `d'. Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^.
(smerge-diff): Setup the buffer's default-directory and add filename to the names so that diff-mode can jump to source.
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): Add dark-background variants.
(smerge-mode-menu): Doc fix.
(smerge-mode-menu): Fill it out.
(smerge-diff-switches): Don't use list* in defcustom.
(smerge-auto-leave): New function and variable. (smerge-basic-map): Rename from smerge-basic-keymap. Change the bindings for smerge-diff-*. (smerge-*-map): Use easy-mmode-defmap. (smerge-(next|prev)): Use easy-mmode-define-navigation. (smerge-keep-*): Use smerge-auto-leave.
New file. Provides a simple minor-mode for files containing diff3-style conflict markers, such as generated by RCS
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
savannah-hackers-public@gnu.org | ViewVC Help |
Powered by ViewVC 1.1.26 |