   (interactive)
   (ignore-errors (backward-word 5)))
 
-;; Patched version to fix this issue:
+;; I like to use the `find-file-at-point' feature if my cursor is on the
+;; file name in a line like below,
+;;
+;;   `include "some_file.v".
+;;
 ;; In Verilog/C/C++, comments can begin with //.
-;; Here's an example comment,
-;; //This is a comment
-;; I like to use the find-file-at-point feature. If my cursor is on the
-;; file name in `include "some_file.v".  But if my cursor is on the above
-;; example comment and if I hit C-x C-f, emacs tries to open a tentative
-;; path //This!
-;; How do I selectively prevent find-file-at-point from activating? In
-;; this case, when the major mode is verilog-mode, how do I NOT do
-;; find-file-at-point when my cursor is on a line where the first 2
-;; non-space characters are //?
-;; http://emacs.stackexchange.com/q/107/115
+;;
+;;   //This is an example comment
+;;
+;; Pre-requisites for this bug to show up in emacs -Q:
+;;
+;;  (ido-mode 1)
+;;  (setq ido-use-filename-at-point 'guess)
+;;
+;; Now if my cursor is on the above example comment and if I hit C-x C-f, emacs
+;; tries to open a tentative path "//This"!
+;; Below patch from http://emacs.stackexchange.com/q/107/115 fixes that.
 (use-package ffap
-  :commands (find-file-at-point ffap-guess-file-name-at-point)
+  :defer t
   :config
   (progn
     (defun ffap-string-at-point (&optional mode)
+      "Return a string of characters from around point.
+
+MODE (defaults to value of `major-mode') is a symbol used to look up string
+syntax parameters in `ffap-string-at-point-mode-alist'.
+
+If MODE is not found, we use `file' instead of MODE.  If the region is active,
+return a string from the region.  Sets the variable `ffap-string-at-point' and
+the variable `ffap-string-at-point-region'."
       (let* ((args
               (cdr
                (or (assq (or mode major-mode) ffap-string-at-point-mode-alist)
                    (assq 'file ffap-string-at-point-mode-alist))))
-             next-comment ; patch
+             next-comment ; patch part 1/3
              (pt (point))
              (beg (if (use-region-p)
                       (region-beginning)
                     (save-excursion
                       (skip-chars-backward (car args))
                       (skip-chars-forward (nth 1 args) pt)
-                      (save-excursion ; patch
-                        (setq next-comment ; patch
-                              (progn (comment-search-forward (line-end-position) :noerror) ; patch
-                                     (point)))) ; patch
-                      ;; (message "next-comment = %d" next-comment) ; patch
+                      ;; patch part 2/3
+                      (setq next-comment (save-excursion
+                                           (comment-search-forward
+                                            (line-end-position) :noerror)
+                                           (point)))
+                      ;;
                       (point))))
              (end (if (use-region-p)
                       (region-end)

;; Avy Jump
;; https://github.com/abo-abo/avy
(use-package avy
  :commands (modi/goto-line)
  :init
  (progn
    (global-set-key [remap goto-line] #'modi/goto-line))

;; Time-stamp: <2016-05-19 11:28:05 kmodi>

(>=e "25.0"
    (setq fast-but-imprecise-scrolling t))
