1 files changed, 29 insertions, 27 deletions

diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 8b5b3f312e4..bd675c376bb 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -252,7 +252,7 @@ loaded, add these packages to `org-export-latex-packages-alist'."
 
     "* Other"
     "** Misc. (often used)"
-    ("circ" "\\circ" t "ˆ" "^" "^" "ˆ")
+    ("circ" "\\^{}" nil "ˆ" "^" "^" "ˆ")
     ("vert" "\\vert{}" t "|" "|" "|" "|")
     ("brvbar" "\\textbrokenbar{}" nil "¦" "|" "¦" "¦")
     ("sect" "\\S" nil "§" "paragraph" "§" "§")
@@ -260,6 +260,11 @@ loaded, add these packages to `org-export-latex-packages-alist'."
     ("lt" "\\textless{}" nil "&lt;" "<" "<" "<")
     ("gt" "\\textgreater{}" nil "&gt;" ">" ">" ">")
     ("tilde" "\\~{}" nil "&tilde;" "~" "~" "~")
+    ("slash" "/" nil "/" "/" "/" "/")
+    ("plus" "+" nil "+" "+" "+" "+")
+    ("under" "\\_" nil "_" "_" "_" "_")
+    ("equal" "=" nil "=" "=" "=" "=")
+    ("asciicirc" "\\textasciicircum{}" nil "^" "^" "^" "^")
     ("dagger" "\\textdagger{}" nil "&dagger;" "[dagger]" "[dagger]" "†")
     ("Dagger" "\\textdaggerdbl{}" nil "&Dagger;" "[doubledagger]" "[doubledagger]" "‡")
 
@@ -492,34 +497,31 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; Helpfunctions to create a table for orgmode.org/worg/org-symbols.org
 
 (defun org-entities-create-table ()
-  "Create an org-mode table with all entities."
+  "Create an Org mode table with all entities."
   (interactive)
-  (let ((ll org-entities)
-	(pos (point))
-	e latex mathp html latin utf8 name ascii)
+  (let ((pos (point)) e latex mathp html latin utf8 name ascii)
     (insert "|Name|LaTeX code|LaTeX|HTML code |HTML|ASCII|Latin1|UTF-8\n|-\n")
-    (while ll
-      (when (listp e)
-	(setq e (pop ll))
-	(setq name (car e)
-	      latex (nth 1 e)
-	      mathp (nth 2 e)
-	      html (nth 3 e)
-	      ascii (nth 4 e)
-	      latin (nth 5 e)
-	      utf8 (nth 6 e))
-	(if (equal ascii "|") (setq ascii "\\vert"))
-	(if (equal latin "|") (setq latin "\\vert"))
-	(if (equal utf8  "|") (setq utf8  "\\vert"))
-	(if (equal ascii "=>") (setq ascii "= >"))
-	(if (equal latin "=>") (setq latin "= >"))
-	(insert "|" name
-		"|" (format "=%s=" latex)
-		"|" (format (if mathp "$%s$" "$\\mbox{%s}$")
-			    latex)
-		"|" (format "=%s=" html) "|" html
-		"|" ascii "|" latin "|" utf8
-		"|\n")))
+    (mapc (lambda (e) (when (listp e)
+			(setq name (car e)
+			      latex (nth 1 e)
+			      mathp (nth 2 e)
+			      html (nth 3 e)
+			      ascii (nth 4 e)
+			      latin (nth 5 e)
+			      utf8 (nth 6 e))
+			(if (equal ascii "|") (setq ascii "\\vert"))
+			(if (equal latin "|") (setq latin "\\vert"))
+			(if (equal utf8  "|") (setq utf8  "\\vert"))
+			(if (equal ascii "=>") (setq ascii "= >"))
+			(if (equal latin "=>") (setq latin "= >"))
+			(insert "|" name
+				"|" (format "=%s=" latex)
+				"|" (format (if mathp "$%s$" "$\\mbox{%s}$")
+					    latex)
+				"|" (format "=%s=" html) "|" html
+				"|" ascii "|" latin "|" utf8
+				"|\n")))
+	  org-entities)
     (goto-char pos)
     (org-table-align)))