• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.10/emacs-93/emacs/lisp/

Lines Matching +refs:point +refs:max

38 ;;   	 (goto-char (point-min))
168 (let ((state (cons (point) (buffer-modified-tick))))
183 ["Keep Current" smerge-keep-current :help "Use current (at point) version"
217 ["Keep Current" smerge-keep-current :help "Use current (at point) version"]
218 ["Kill Current" smerge-kill-current :help "Remove current (at point) version"]
265 (save-excursion (goto-char (point-min))
276 (let ((mb2 (or (match-beginning 2) (point-max)))
277 (me2 (or (match-end 2) (point-min))))
279 (delete-region (max me2 (match-end 1)) (match-beginning 3))
356 (save-excursion (posn-set-point (event-end event)) (smerge-check 1)))
358 (posn-set-point (event-end event))
374 ;; There's no conflict at point, the text-props are just obsolete.
378 (smerge-remove-props (or beg (point-min)) (or end (point-max)))
382 "Resolve the conflict at point intelligently.
442 (< (point) (match-beginning i))
443 (>= (point) (match-end i)))
497 (let* ((orig-point (point))
507 (_ (assert (< orig-point (match-end 0))))
578 Returns non-nil if a match is found between point and LIMIT.
581 (pos (point))
583 ;; First check to see if point is already inside a conflict, using
592 (if (<= (point) pos)
605 (let ((conflict (smerge-conflict-overlay (1- (point)))))
636 (goto-char (point-min))
641 (write-region (point-min) (point-max) file nil 'nomessage)))))
682 (goto-char (point-min))
686 (buffer-substring (point) (line-end-position)))
733 (goto-char (point-min))
767 (goto-char (point-min))
778 (goto-char (point-min))
791 (goto-char (point-min))
844 (goto-char (point-min))
849 (smerge-remove-props (point-min) (point-max))))