Enable lexical-binding

john2x · Jul 9, 2022 · 008f88a · 008f88a
1 parent aa279bf
commit 008f88a
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 17 deletions.
diff --git a/lisp/dank-mode-backend.el b/lisp/dank-mode-backend.el
@@ -1,4 +1,4 @@
-;;; dank-mode-backend.el --- Major mode for browsing Reddit
+;;; dank-mode-backend.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-comment.el b/lisp/dank-mode-comment.el
@@ -1,4 +1,4 @@
-;;; dank-mode-comment.el --- Major mode for browsing Reddit
+;;; dank-mode-comment.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-comments.el b/lisp/dank-mode-comments.el
@@ -1,4 +1,4 @@
-;;; dank-mode-comments.el --- Major mode for browsing Reddit
+;;; dank-mode-comments.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 
@@ -426,17 +426,17 @@ If there is no next root, then navigate to the end of the comment."
 (defun dank-mode-comments-browse-post-link (&optional eww)
   "Open the current post link in a browser.
 If EWW is non-nil, browse in eww instead of the browser."
-  (interactive)
+  (interactive "P")
   (let* ((post-link (dank-mode-post-link dank-mode-comments-current-post))
          (browse-url-browser-function (if eww 'eww-browse-url 'browse-url-default-browser)))
     (browse-url post-link)))
 
 (defun dank-mode-comments-browse-post-comments (&optional eww)
   "Open the current comments in a browser.
 If EWW is non-nil, browse in eww instead of the browser."
-  (interactive)
+  (interactive "P")
   (let ((browse-url-browser-function (if eww 'eww-browse-url 'browse-url-default-browser)))
-    (browse-url (concat "https://old.reddit.com" dank-mode-comments-current-permalink))))
+    (browse-url (concat (dank-mode-utils-reddit-url) dank-mode-comments-current-permalink))))
 
 (provide 'dank-mode-comments)
 ;;; dank-mode-comments.el ends here
diff --git a/lisp/dank-mode-faces.el b/lisp/dank-mode-faces.el
@@ -1,4 +1,4 @@
-;;; dank-mode-faces.el --- Major mode for browsing Reddit
+;;; dank-mode-faces.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-oauth.el b/lisp/dank-mode-oauth.el
@@ -1,4 +1,4 @@
-;;; dank-mode-oauth.el --- Major mode for browsing Reddit
+;;; dank-mode-oauth.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-post.el b/lisp/dank-mode-post.el
@@ -1,4 +1,4 @@
-;;; dank-mode-post.el --- Major mode for browsing Reddit
+;;; dank-mode-post.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-posts.el b/lisp/dank-mode-posts.el
@@ -1,4 +1,4 @@
-;;; dank-mode-posts.el --- Major mode for browsing Reddit
+;;; dank-mode-posts.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 
@@ -325,18 +325,18 @@ Optional SORTING is the sort order for the comments."
 (defun dank-mode-posts-browse-post-link-at-point (pos &optional eww)
   "Open the post link at POS in a browser.
 If EWW is non-nil, browse in eww instead of the browser."
-  (interactive "d")
+  (interactive "d\nP")
   (let* ((post-link (dank-mode-post-link (dank-mode-utils-ewoc-data dank-mode-posts-current-ewoc pos)))
          (browse-url-browser-function (if eww 'eww-browse-url 'browse-url-default-browser)))
     (browse-url post-link)))
 
 (defun dank-mode-posts-browse-post-comments-at-point (pos &optional eww)
   "Open the post comments at POS in a browser.
 If EWW is non-nil, browse in eww instead of the browser."
-  (interactive "d")
-  (let ((post-permalink (dank-mode-post-permalink (dank-mode-utils-ewoc-data dank-mode-posts-current-ewoc point)))
+  (interactive "d\nP")
+  (let ((post-permalink (dank-mode-post-permalink (dank-mode-utils-ewoc-data dank-mode-posts-current-ewoc pos)))
         (browse-url-browser-function (if eww 'eww-browse-url 'browse-url-default-browser)))
-    (browse-url (concat "https://old.reddit.com" post-permalink))))
+    (browse-url (concat (dank-mode-utils-reddit-url) post-permalink))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; interaction functions ;;

diff --git a/lisp/dank-mode-url.el b/lisp/dank-mode-url.el
@@ -1,4 +1,4 @@
-;;; dank-mode-url.el --- Major mode for browsing Reddit
+;;; dank-mode-url.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 

diff --git a/lisp/dank-mode-utils.el b/lisp/dank-mode-utils.el
@@ -1,4 +1,4 @@
-;;; dank-mode-utils.el --- Major mode for browsing Reddit
+;;; dank-mode-utils.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario
 
@@ -24,6 +24,11 @@
   :type 'function
   :group 'dank-mode)
 
+(defcustom dank-mode-prefer-new-reddit nil
+  "Prefer new Reddit over old Reddit."
+  :type 'boolean
+  :group 'dank-mode)
+
 (when (require 'markdown-mode nil 'noerror)
   (setq dank-mode-utils-fill-paragraph-function 'markdown-fill-paragraph)
   (setq dank-mode-utils-fill-forward-paragraph-function 'markdown-fill-forward-paragraph))
@@ -179,6 +184,12 @@ transformation."
          t t)
       (set-match-data saved-match-data))))
 
+(defun dank-mode-utils-reddit-url ()
+  "Return the preferred Reddit URL"
+  (if dank-mode-prefer-new-reddit
+      "https://www.reddit.com"
+    "https://old.reddit.com"))
+
 (provide 'dank-mode-utils)
 
 ;;; dank-mode-utils.el ends here
diff --git a/lisp/dank-mode.el b/lisp/dank-mode.el
@@ -1,4 +1,4 @@
-;;; dank-mode.el --- Major mode for browsing Reddit
+;;; dank-mode.el --- Major mode for browsing Reddit -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021 John Louis Del Rosario