Skip to content

Commit

Permalink
Merge remote-tracking branch 'gh/fix-recent-buffers-commands'
Browse files Browse the repository at this point in the history
  • Loading branch information
aadcg committed Dec 18, 2023
2 parents 2464ffe + 1a30d40 commit bd28190
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
7 changes: 7 additions & 0 deletions source/changelog.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,13 @@ invoked via " (:code "flatpak-spawn --host <command> <command-args>") "."))))
(:li "Improve architecture of " (:nxref :class-name 'nyxt/mode/hint:hint-mode)
" as to ensure that hints are shown for arbitrary URLs." ))))

(define-version "3.X.Y"
(:nsection :title "Bug fixes"
(:ul
(:li "Fix commands "
(:nxref :command 'reopen-last-buffer) " and "
(:nxref :command 'reopen-buffer) "."))))

(define-version "4-pre-release-1"
(:li "When on pre-release, push " (:code "X-pre-release")
" feature in addition to " (:code "X-pre-release-N") "one."))
Expand Down
9 changes: 0 additions & 9 deletions source/renderer/gtk.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -2210,15 +2210,6 @@ As a second value, return the current buffer index starting from 0."
(gtk-object gtk-buffer) webkit2:+webkit-editing-command-redo+)))
(lambda (e) (echo-warning "Cannot redo: ~a" e))))

(defmethod reload-buffer :around (&optional (buffer (prompt
:prompt "Reload buffer(s)"
:sources (make-instance 'buffer-source))))
"Override Nyxt reload with a DWIM one from WebKit."
;; FIXME: We use `reload-buffer' on unloaded buffers???
(if (member (nyxt::status buffer) '(:unloaded))
(call-next-method)
(webkit:webkit-web-view-reload (gtk-object buffer))))

(define-command-global force-reload-buffers (&optional (buffer (prompt
:prompt "Reload buffer(s)"
:sources (make-instance 'buffer-source))))
Expand Down

0 comments on commit bd28190

Please sign in to comment.