Skip to content

Commit

Permalink
Add version 0.3.0 screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
susam committed Jun 22, 2023
1 parent 5f41f56 commit a9d919e
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 21 deletions.
40 changes: 26 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ explained in detail later in the [Emacs Server](#emacs-server) and
[Emacs Launcher](#emacs-launcher) sections. Here is how the Emacs
environment is going to look after setting up this project:

[![Screenshot of Emacs][demo-screenshot]][demo-screenshot]
[![Screenshot of Emacs][demo-img]][A screenshot of Emacs customized with Emfy]

[demo-screenshot]: https://i.imgur.com/5TPWniw.png
[demo-img]: https://susam.github.io/blob/img/emfy/emfy-0.3.0.png

If you are already comfortable with Emacs and only want to understand
the content of [`.emacs`] or [`em`], you can skip ahead directly to
Expand Down Expand Up @@ -650,8 +650,10 @@ choose another theme, or skip this section.
By default the Wombat theme looks like this:
<!-- wombat-default -->
<a href="https://i.imgur.com/kCc4mQZ.png"><img alt="Screenshot of Wombat default theme"
src="https://i.imgur.com/kCc4mQZ.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-wombat1.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-wombat1.png"
alt="Screenshot of Wombat default theme"
width="580"></a>
In this theme, the cursor, search matches, and comments can often
be difficult to spot because they are all colored with different
Expand All @@ -663,8 +665,10 @@ choose another theme, or skip this section.
this:
<!-- wombat-custom -->
<a href="https://i.imgur.com/Ex3QOJe.png"><img alt="Screenshot of Wombat custom theme"
src="https://i.imgur.com/Ex3QOJe.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-wombat2.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-wombat2.png"
alt="Screenshot of Wombat custom theme"
width="580"></a>
- Choose a darker shade of gray for the background color to improve
the contrast of the theme:
Expand Down Expand Up @@ -834,8 +838,10 @@ lines at the end of the file.
in the screenshot below:
<!-- lorem1 -->
<a href="https://i.imgur.com/sonx2pp.png"><img alt="Whitespace highlighted"
src="https://i.imgur.com/sonx2pp.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem1.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem1.png"
alt="Screenshot of whitespace highlighted in Emacs"
width="580"></a>
The screenshot above shows one stray trailing space in the second
line and two trailing spaces in the third line. These trailing
Expand All @@ -855,8 +861,10 @@ lines at the end of the file.
feature:
<!-- lorem2 -->
<a href="https://i.imgur.com/WNtaVkm.png"><img alt="Non-existent line indicators"
src="https://i.imgur.com/WNtaVkm.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem2.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem2.png"
alt="Screenshot of non-existent line indicators"
width="580"></a>
The screenshot shows that there are two blank lines just before
the end of the buffer. The tiny horizontal dashes on the left
Expand All @@ -878,8 +886,10 @@ lines at the end of the file.
file that does not contain a terminating newline:
<!-- lorem3 -->
<a href="https://i.imgur.com/dGjjT3Z.png"><img alt="File without terminating newline"
src="https://i.imgur.com/dGjjT3Z.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem3.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem3.png"
alt="Screenshot of a file without terminating newline"
width="580"></a>
If there is only one line in the buffer and that line is
terminated with a newline then a left-bracket (`[`) appears in the
Expand All @@ -889,8 +899,10 @@ lines at the end of the file.
contains a terminating newline:
<!-- lorem4 -->
<a href="https://i.imgur.com/1Ln4FbE.png"><img alt="File with terminating newline"
src="https://i.imgur.com/1Ln4FbE.png" width="580"></a>
<a href="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem4.png"><img
src="https://susam.github.io/blob/img/emfy/emfy-0.3.0-lorem4.png"
alt="Screenshot of a file with terminating newline"
width="580"></a>
To summarize, these shapes (`[`, ``, or ``) show where the last
newline of the buffer exists. The last newline of the buffer
Expand Down
48 changes: 42 additions & 6 deletions meta/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,50 @@
main:
loc:
f() { grep -vE '^$$|^;|^ *".*"$$' ../.emacs; }; f; f | wc -l

demo:
mv ../.git ../git
emacs -q -l ../.emacs --eval '(progn (set-frame-size (selected-frame) 132 32) (find-file "example.md") (split-window-right) (find-file "example.el") (goto-char (1- (point-max))) (message ""))'
cp ../.emacs init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 132 32) (find-file "example.md") (split-window-right) (find-file "example.el") (goto-char (1- (point-max))) (message ""))'
mv ../git ../.git

loc:
f() { grep -vE '^$$|^;|^ *".*"$$' ../.emacs; }; f; f | wc -l
wombat1:
mv ../.git ../git
sed -n '1,/load-theme/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "foo.el") (message ""))'
mv ../git ../.git

wombat2:
mv ../.git ../git
sed -n '1,/Interactively do things/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "foo.el") (message ""))'
mv ../git ../.git

lorem1:
mv ../.git ../git
sed -n '1,/show-trailing-whitespace/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "lorem1.txt") (message ""))'
mv ../git ../.git

lorem2:
mv ../.git ../git
sed -n '1,/indicate-empty-lines/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "lorem2.txt") (message ""))'
mv ../git ../.git

lorem:
lorem3:
printf '%s' "$$(cat lorem2.txt)" > lorem3.txt
mv ../.git ../git
sed -n '1,/indicate-buffer-boundaries/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "lorem3.txt") (message ""))'
mv ../git ../.git

lorem4:
printf '%s\n' "$$(cat lorem2.txt)" > lorem4.txt
mv ../.git ../git
sed -n '1,/indicate-buffer-boundaries/p' ../.emacs > init.el
emacs -q -l init.el --eval '(progn (set-frame-size (selected-frame) 80 12) (find-file "lorem4.txt") (message ""))'
mv ../git ../.git

reset:
mv ../git ../.git
mv ../git ../.git; :
rm -f init.el lorem3.txt lorem4.txt
2 changes: 1 addition & 1 deletion meta/foo.el
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;;; Elisp Examples.
;;; Elisp Examples. -*- lexical-binding: t; -*-

(defun hello-world ()
"Show 'hello, world' message."
Expand Down

0 comments on commit a9d919e

Please sign in to comment.