/[emacs]/emacs/lisp/emerge.el
ViewVC logotype

Diff of /emacs/lisp/emerge.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.52 by lektu, Mon May 16 11:33:46 2005 UTC revision 1.53 by lektu, Wed Aug 24 11:35:31 2005 UTC
# Line 44  Line 44 
44  ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]  ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]
45  ;;;###autoload   '("Buffers..." . emerge-buffers))  ;;;###autoload   '("Buffers..." . emerge-buffers))
46    
47    (eval-when-compile
48      ;; There aren't really global variables, just dynamic bindings
49      (defvar merge-begin) (defvar merge-end) (defvar template)
50      (defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end)
51      (defvar diff) (defvar diff-vector) (defvar valid-diff))
52    
53  ;;; Macros  ;;; Macros
54    
55  (defmacro emerge-eval-in-buffer (buffer &rest forms)  (defmacro emerge-eval-in-buffer (buffer &rest forms)

Legend:
Removed from v.1.52  
changed lines
  Added in v.1.53

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26