Lines Matching +defs:before +defs:string
115 "Return string describing the version of Emerge.
133 ;; The file names are always expanded (see expand-file-name) before being
141 :type 'string
146 :type 'string
150 :type 'string
174 :type 'string
178 :type 'string
196 (defcustom emerge-before-flag "vvvvvvvvvvvvvvvvvvvv\n"
198 Must be set before Emerge is loaded, or emerge-new-flags must be run
200 :type 'string
204 Must be set before Emerge is loaded, or emerge-new-flags must be run
206 :type 'string
251 (defvar emerge-before-flag-length)
252 (defvar emerge-before-flag-lines)
253 (defvar emerge-before-flag-match)
270 "Function to be called after `emerge-{before,after}-flag'.
273 (setq emerge-before-flag-length (length emerge-before-flag))
274 (setq emerge-before-flag-lines
275 (emerge-count-matches-string emerge-before-flag "\n"))
276 (setq emerge-before-flag-match (regexp-quote emerge-before-flag))
279 (emerge-count-matches-string emerge-after-flag "\n"))
282 (defun emerge-count-matches-string (string regexp)
286 (while (string-match regexp string i)
304 :type 'string
315 The template is inserted as a string, with the following interpolations:
322 :type 'string
347 Must be set before Emerge is loaded."
348 :type 'string
672 (let* ((a-begin (string-to-number (buffer-substring (match-beginning 1)
677 (string-to-number (buffer-substring b e))
680 (b-begin (string-to-number (buffer-substring (match-beginning 5)
685 (string-to-number (buffer-substring b e))
689 (if (string-equal diff-type "a")
694 (if (string-equal diff-type "d")
699 ;; (string-equal diff-type "c")
847 (if (not (string-equal agreement "2"))
857 (cond ((string-equal agreement "1") 'prefer-A)
858 ((string-equal agreement "3") 'prefer-B)
873 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
877 (list (string-to-number
879 (1+ (string-to-number
882 (let ((x (string-to-number
886 (let ((x (1+ (string-to-number
1012 (if (string= (car command-line-args-left) "-a")
1068 (read-string "Revision A to merge: " emerge-last-revision-A)
1069 (read-string "Revision B to merge: " emerge-last-revision-B)))
1090 (read-string "Revision A to merge: " emerge-last-revision-A)
1091 (read-string "Revision B to merge: " emerge-last-revision-B)
1092 (read-string "Ancestor: " emerge-last-revision-ancestor)))
1222 ;; Break apart the tab (before =) and the filename (after =)
1230 ((string-equal tag "a")
1234 ((string-equal tag "b")
1238 ((or (string-equal tag "anc") (string-equal tag "ancestor"))
1242 ((or (string-equal tag "out") (string-equal tag "output"))
1311 (if (and ancestor-dir (string-equal ancestor-dir ""))
1313 (if (and output-dir (string-equal output-dir ""))
1317 (if (not (string-equal (substring a-dir -1) "/"))
1320 (if (not (string-equal (substring b-dir -1) "/"))
1325 (if (not (string-equal (substring ancestor-dir -1) "/"))
1330 (if (not (string-equal (substring output-dir -1) "/"))
1346 (function string-lessp))))
1350 (if (and (cdr p) (string-equal (car p) (car (cdr p))))
1357 (if (and a-dir-files (string-equal (car a-dir-files) f))
1361 (if (and b-dir-files (string-equal (car b-dir-files) f))
1365 (if (and ancestor-dir-files (string-equal (car ancestor-dir-files) f))
1565 (prin1-to-string err))))))
1610 (1- emerge-before-flag-length))
1618 (1- emerge-before-flag-length))
1626 (1- emerge-before-flag-length))
1640 ;; possible in the A or B windows, it is performed there before the error
2100 Leaves point after text, mark before.
2101 With prefix argument, puts point before, mark after."
2118 Leaves point after text, mark before.
2119 With prefix argument, puts point before, mark after."
2135 "Leaves the point before this difference and the mark after it.
2136 With prefix argument, puts mark before, point after."
2509 (setq temp (- temp emerge-before-flag-lines)))
2514 (defun emerge-set-combine-template (string &optional localize)
2522 (setq emerge-combine-versions-template string)
2634 (defun emerge-place-flags-in-buffer (buffer difference before-index
2639 (emerge-place-flags-in-buffer1 difference before-index after-index))
2640 (emerge-place-flags-in-buffer1 difference before-index after-index)))
2642 (defun emerge-place-flags-in-buffer1 (difference before-index after-index)
2644 ;; insert the flag before the difference
2645 (let ((before (aref (aref emerge-globalized-difference-list difference)
2646 before-index))
2648 (goto-char before)
2650 (insert-before-markers emerge-before-flag)
2652 ;; Put the marker(s) referring to this position 1 character before the
2656 (set-marker before (1- before))
2657 (let ((n (1- difference)) after-marker before-marker diff-list)
2665 (setq before-marker (aref diff-list before-index))
2666 (if (= before-marker here)
2667 (setq before-marker (1- before-marker)))
2681 (let ((n (1+ difference)) before-marker after-marker diff-list)
2686 before-marker (aref diff-list before-index))
2687 (= before-marker here)))
2688 (set-marker before-marker (1+ before-marker))
2705 (defun emerge-remove-flags-in-buffer (buffer before after)
2710 (goto-char (- before (1- emerge-before-flag-length)))
2711 (if (looking-at emerge-before-flag-match)
2712 (delete-char emerge-before-flag-length)
2799 (not (string-equal alternative-default-dir
2855 (x-string (emerge-eval-in-buffer
2859 (y-string (emerge-eval-in-buffer
2863 (if (not (string-equal x-string y-string))
2922 ;;; Functions that query the user before he can write out the current buffer.
3064 ;; (let ((key (concat prefix (char-to-string i))))
3072 ;; (concat prefix (char-to-string (car (car map))))))
3143 that is checked before calling this function.
3161 (emerge-hash-string-into-string
3173 ;; Hash a string into five characters more-or-less suitable for use in a file
3175 (defun emerge-hash-string-into-string (s)
3187 (char-to-string b)))
3190 ;; Quote any /s in a string by replacing them with \!.
3194 (while (string-match "[/\\]" s limit)
3196 (if (string= (substring s (match-beginning 0)
3216 (while (string-match emerge-metachars s limit)