Show
Ignore:
Timestamp:
05/13/06 11:31:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/diff-mode.el

    r4073 r4079  
    634634START and END are either taken from the region (if a prefix arg is given) or 
    635635else cover the whole bufer." 
    636   (interactive (if current-prefix-arg 
    637                    (list (mark) (point)) 
     636  (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 
     637                   (list (region-beginning) (region-end)) 
    638638                 (list (point-min) (point-max)))) 
    639639  (unless (markerp end) (setq end (copy-marker end))) 
    …… 
    723723With a prefix argument, convert unified format to context format." 
    724724  (interactive (if (and transient-mark-mode mark-active) 
    725                    (list (mark) (point) current-prefix-arg) 
     725                   (list (region-beginning) (region-end) current-prefix-arg) 
    726726                 (list (point-min) (point-max) current-prefix-arg))) 
    727727  (if to-context 
    …… 
    796796START and END are either taken from the region (if a prefix arg is given) or 
    797797else cover the whole bufer." 
    798   (interactive (if current-prefix-arg 
    799                    (list (mark) (point)) 
     798  (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 
     799                   (list (region-beginning) (region-end)) 
    800800                 (list (point-min) (point-max)))) 
    801801  (unless (markerp end) (setq end (copy-marker end))) 
    …… 
    858858START and END are either taken from the region (if a prefix arg is given) or 
    859859else cover the whole bufer." 
    860   (interactive (if current-prefix-arg 
    861                    (list (mark) (point)) 
     860  (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 
     861                   (list (region-beginning) (region-end)) 
    862862                 (list (point-min) (point-max)))) 
    863863  (let ((inhibit-read-only t)) 
    …… 
    10701070(defun diff-hunk-text (hunk destp char-offset) 
    10711071  "Return the literal source text from HUNK as (TEXT . OFFSET). 
    1072 if DESTP is nil TEXT is the source, otherwise the destination text. 
     1072If DESTP is nil, TEXT is the source, otherwise the destination text. 
    10731073CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding 
    10741074char-offset in TEXT." 
    …… 
    13031303is given) determines whether to jump to the old or the new file. 
    13041304If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument]) 
    1305   then `diff-jump-to-old-file' is also set, for the next invocations." 
     1305then `diff-jump-to-old-file' is also set, for the next invocations." 
    13061306  (interactive (list current-prefix-arg last-input-event)) 
    13071307  ;; When pointing at a removal line, we probably want to jump to