   "Search `ffap-string-at-point' for a line number pattern and
 save it in `ffap-file-at-point-line-number' variable."
   (let* ((string (ffap-string-at-point)) ;; string/name definition copied from `ffap-string-at-point'
-         (name
-          (or (condition-case nil
-                  (and (not (string-match "//" string)) ; foo.com://bar
-                       (substitute-in-file-name string))
-                (error nil))
-              string))
-         (line-number-string
-          (and (string-match ":[0-9]+" name)
-               (substring name (1+ (match-beginning 0)) (match-end 0))))
-         (line-number
-          (and line-number-string
-               (string-to-number line-number-string))))
+	 (name
+	  (or (condition-case nil
+		  (and (not (string-match "//" string)) ; foo.com://bar
+		       (substitute-in-file-name string))
+		(error nil))
+	      string))
+	 (line-number-string
+	  (and (string-match ":[0-9]+" name)
+	       (substring name (1+ (match-beginning 0)) (match-end 0))))
+	 (line-number
+	  (and line-number-string
+	       (string-to-number line-number-string))))
     (if (and line-number (> line-number 0))
-        (setq ffap-file-at-point-line-number line-number)
+	(setq ffap-file-at-point-line-number line-number)
       (setq ffap-file-at-point-line-number nil))))
 
 (defadvice find-file-at-point (after ffap-goto-line-number activate)

    ;; /ssh:ubuntu@10.17.20.215|sudo:10.17.20.215:/
    ;; http://irreal.org/blog/?p=895
    ;; (add-to-list 'tramp-default-proxies-alist
    ;; 		 '(nil "\\`root\\'" "/ssh:%h:"))
    ;; (add-to-list 'tramp-default-proxies-alist
    ;; 		 '((regexp-quote (system-name)) nil nil))
    ;;    (set-default 'tramp-default-proxies-alist (quote ((".*" "\\`root\\'" "/ssh:%h:"))))
    (setq tramp-ssh-controlmaster-options
	  (concat

(defun ediff-copy-both-to-C ()
  (interactive)
  (ediff-copy-diff ediff-current-difference nil 'C nil
		   (concat
		    (ediff-get-region-contents ediff-current-difference 'A ediff-control-buffer)
		    (ediff-get-region-contents ediff-current-difference 'B ediff-control-buffer))))

(defun add-d-to-ediff-mode-map ()
  (define-key ediff-mode-map "d" 'ediff-copy-both-to-C))
