Skip to content

Handle C-style comments better, fix style warnings #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rudi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle C-style comments better, fix style warnings #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions poporg.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@

;;; Code:

(eval-when-compile
(require 'cl))

;; * Customs
;; ** Group

Expand All @@ -59,7 +56,7 @@ If non-nil, in the edit buffer decrement `fill-column' by the prefix length."

If t, when inserting a blank line from the edit buffer back into the source
buffer, remove trailing whitespace from the prefix. This is very useful when
editing docstrings in python, for instance. If equal to the symbol 'all, don't
editing docstrings in python, for instance. If equal to the symbol `all', don't
insert the prefix at all for blank lines."
:group 'poporg
:type '(choice
Expand Down Expand Up @@ -124,8 +121,8 @@ By default this hook enables `org-mode'."
For each edit BUFFER, there is an OVERLAY graying out the edited block comment
or string in the original buffer, and a PREFIX that was removed from all lines
in the edit buffer and which is going to be prepended to these lines before
returning them the original buffer. TYPE is either 'string, 'comment, or
'region.")
returning them the original buffer. TYPE is either `string', `comment', or
`region'.")

(defvar poporg-orig-point nil
"Keeps track of the value of point in the calling buffer.
Expand Down Expand Up @@ -190,14 +187,18 @@ If yes, pop the editing buffer for the first one and return t."
(let ((com-start (if comment-start (poporg-chomp comment-start) "")))
(when (looking-at (regexp-quote com-start))
(goto-char (match-end 0))))
(when (looking-at comment-start-skip)
(goto-char (match-end 0)))
(skip-syntax-forward "<"))

(defun poporg-skip-past-comment-end ()
"Skip whitespace and `comment-end'."
(skip-syntax-forward " ")
(let ((com-end (if comment-end (poporg-chomp comment-end) "")))
(when (looking-at (regexp-quote com-end))
(goto-char (match-end 0)))))
(goto-char (match-end 0))))
(when (looking-at comment-end-skip)
(goto-char (match-end 0))))

;; *** check whitespace

Expand Down Expand Up @@ -304,7 +305,7 @@ If a string or comment was found, return a list

(TYPE START END)

where TYPE is either 'string or 'comment and START and END are markers. The
where TYPE is either `string' or `comment' and START and END are markers. The
enclosed region includes the delimiters.

If a comment was found, the region between START and END is a number of complete
Expand Down Expand Up @@ -812,7 +813,7 @@ Also update the overlay."

(define-minor-mode poporg-mode
"Install keybindings for a poporg edit buffer."
nil " pop" poporg-mode-map)
:lighter "pop" :keymap poporg-mode-map)


(provide 'poporg)
Expand Down