Minor edits

.config/emacs/config.el

@@ -70,12 +70,11 @@
     (evil-define-key 'normal peep-dired-mode-map (kbd "k") 'peep-dired-prev-file)
 )
 
-<<<<<<< HEAD
 (use-package drag-stuff
   :init
   (drag-stuff-global-mode 1)
   (drag-stuff-define-keys))
-=======
+
 (setq ediff-split-window-function 'split-window-horizontally
       ediff-window-setup-function 'ediff-setup-windows-plain)
 
@@ -85,7 +84,6 @@
   (define-key ediff-mode-map "k" 'ediff-previous-difference))
 
 (add-hook 'ediff-mode-hook 'dt-ediff-hook)
->>>>>>> ada9eb05c6d0f92d0c6f610f2c1db552fe05340e
 
 (use-package elfeed
   :config
@@ -535,7 +533,6 @@
 (require 'org-tempo)
 
 (use-package pdf-tools
-  :ensure t
   :defer t
   :commands (pdf-loader-install)
   :mode "\\.pdf\\'"
@@ -545,6 +542,9 @@
   :init (pdf-loader-install)
   :config (add-to-list 'revert-without-query ".pdf"))
 
+;;(add-hook 'pdf-view-mode-hook #'dt/turn-off-line-numbers)
+(add-hook 'pdf-view-mode-hook #'(lambda () (interactive) (display-line-numbers-mode -1)))
+
 (use-package perspective
   :custom
   ;; NOTE! I have also set 'SCP =' to open the perspective menu.

.config/emacs/config.org

@@ -772,7 +772,7 @@ Org-tempo is not a separate package but a module within org that can be enabled.
 #+end_src
 
 * PDFs
-Handle viewing and annotating pdf's.
+[[https://github.com/vedang/pdf-tools][pdf-tools]] is a replacement of DocView for viewing PDF files inside Emacs.  It uses the =poppler= library, which also means that 'pdf-tools' can by used to modify PDFs.  I use to disable 'display-line-numbers-mode' in 'pdf-view-mode' because line numbers crash it.
 
 #+begin_src emacs-lisp
 (use-package pdf-tools
@@ -785,6 +785,8 @@ Handle viewing and annotating pdf's.
   :init (pdf-loader-install)
   :config (add-to-list 'revert-without-query ".pdf"))
 
+;;(add-hook 'pdf-view-mode-hook #'dt/turn-off-line-numbers)
+(add-hook 'pdf-view-mode-hook #'(lambda () (interactive) (display-line-numbers-mode -1)))
 #+end_src
 
 * PERSPECTIVE