]> code.delx.au - gnu-emacs-elpa/commitdiff
Abort when diff buffer is empty
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 30 Jun 2012 00:52:38 +0000 (04:52 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 30 Jun 2012 00:52:38 +0000 (04:52 +0400)
diff-hl.el

index 384f91e7c710de20893851d244d1885638ee4093..9c0f4652a3ca7fbb609521b5bd77259d6b1f29c4 100644 (file)
     (vc-exec-after `(diff-hl-diff-skip-to ,line))))\r
 \r
 (defun diff-hl-diff-skip-to (line)\r
-  (diff-beginning-of-hunk t)\r
-  (let (found)\r
-    (while (and (looking-at diff-hunk-header-re-unified) (not found))\r
-      (let ((hunk-line (string-to-number (match-string 3)))\r
-            (len (let ((m (match-string 4)))\r
-                   (if m (string-to-number m) 1))))\r
-        (if (> line (+ hunk-line len))\r
-            (diff-end-of-hunk)\r
-          (setq found t)\r
-          (let ((to-go (1+ (- line hunk-line))))\r
-            (while (plusp to-go)\r
-              (forward-line 1)\r
-              (unless (looking-at "^-")\r
-                (decf to-go)))))))))\r
+  (unless (eobp)\r
+    (diff-beginning-of-hunk t)\r
+    (let (found)\r
+      (while (and (looking-at diff-hunk-header-re-unified) (not found))\r
+        (let ((hunk-line (string-to-number (match-string 3)))\r
+              (len (let ((m (match-string 4)))\r
+                     (if m (string-to-number m) 1))))\r
+          (if (> line (+ hunk-line len))\r
+              (diff-end-of-hunk)\r
+            (setq found t)\r
+            (let ((to-go (1+ (- line hunk-line))))\r
+              (while (plusp to-go)\r
+                (forward-line 1)\r
+                (unless (looking-at "^-")\r
+                  (decf to-go))))))))))\r
 \r
 ;;;###autoload\r
 (define-minor-mode diff-hl-mode\r