Mercurial > emacs
comparison lisp/hilit-chg.el @ 38436:b174db545cfd
Some fixes to follow coding conventions.
author | Pavel Janík <Pavel@Janik.cz> |
---|---|
date | Mon, 16 Jul 2001 12:23:00 +0000 |
parents | 64d8d90d180d |
children | 71c0f635874b |
comparison
equal
deleted
inserted
replaced
38435:a9102b5472f0 | 38436:b174db545cfd |
---|---|
851 ;; We use the fact that the buffer is not marked modified at the | 851 ;; We use the fact that the buffer is not marked modified at the |
852 ;; end where we clear its modified status | 852 ;; end where we clear its modified status |
853 (if (buffer-modified-p buf-a) | 853 (if (buffer-modified-p buf-a) |
854 (if (y-or-n-p (format "OK to save %s? " file-a)) | 854 (if (y-or-n-p (format "OK to save %s? " file-a)) |
855 (save-buffer buf-a) | 855 (save-buffer buf-a) |
856 (error "Buffer must be saved before comparing with a file."))) | 856 (error "Buffer must be saved before comparing with a file"))) |
857 (if (and existing-buf (buffer-modified-p buf-b)) | 857 (if (and existing-buf (buffer-modified-p buf-b)) |
858 (if (y-or-n-p (format "OK to save %s? " file-b)) | 858 (if (y-or-n-p (format "OK to save %s? " file-b)) |
859 (save-buffer buf-b) | 859 (save-buffer buf-b) |
860 (error "Cannot compare with a file in an unsaved buffer."))) | 860 (error "Cannot compare with a file in an unsaved buffer"))) |
861 (highlight-changes-mode 'active) | 861 (highlight-changes-mode 'active) |
862 (if existing-buf (with-current-buffer buf-b | 862 (if existing-buf (with-current-buffer buf-b |
863 (highlight-changes-mode 'active))) | 863 (highlight-changes-mode 'active))) |
864 (save-window-excursion | 864 (save-window-excursion |
865 (setq xy (hilit-chg-get-diff-info buf-a file-a buf-b file-b))) | 865 (setq xy (hilit-chg-get-diff-info buf-a file-a buf-b file-b))) |