[elpa] externals/ess d1fd5a52ad 13/19: Fix variable lookup

[ELPA Syncer]

branch: externals/ess
commit d1fd5a52ada82fbebf9f934319d3c805b465fc7f
Author: Lionel Henry <lionel.hry@gmail.com>
Commit: Lionel Henry <lionel.hry@gmail.com>

    Fix variable lookup
---
 lisp/ess-sas-a.el | 71 ++++++++++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 40 deletions(-)

diff --git a/lisp/ess-sas-a.el b/lisp/ess-sas-a.el
index d01f3f488d..3dfd155423 100644
--- a/lisp/ess-sas-a.el
+++ b/lisp/ess-sas-a.el
@@ -876,27 +876,22 @@ optional argument is non-nil, then set-buffer rather than 
switch."
 (defun ess-sas-rtf-portrait (&optional _ess-tmp-font-size)
   "Creates an MS RTF portrait file from the current buffer."
   (interactive)
-;  (ess-sas-file-path t)
   (ess-revert-wisely)
-
   (set-visited-file-name (concat (buffer-name) ".rtf"))
-;    (ess-sas-goto "rtf" t)
-  (if 'buffer-read-only (setq buffer-read-only nil)) ;FIXME: Why quoted?
-    (ess-rtf-replace-chars)
-
-    (goto-char (point-min))
-    (insert (concat
-             "{\\rtf1\\ansi{\\fonttbl\\f1\\fmodern " ess-sas-rtf-font-name 
";}\n"
-             "\\margl720\\margr720\\margt720\\margb720\n"
-             
"{\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;\\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;\\red0\\green0\\blue128;\\red0\\green128\\blue128;\\red0\\green128\\blue0;\\red128\\green0\\blue128;\\red128\\green0\\blue0;\\red128\\green128\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\n"
-             "{\\stylesheet{\\s15\\plain\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs 
Text;}{\\*\\cs16 \\additive\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs Base Style;}}\n"
-             
"{\\plain\\s15{\\cs16\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024{\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024\n"))
-
-    (goto-char (point-max))
-    (insert "}}}}\n")
-
-    (save-buffer)
-    (kill-buffer (current-buffer)))
+  (when buffer-read-only
+    (setq buffer-read-only nil))
+  (ess-rtf-replace-chars)
+  (goto-char (point-min))
+  (insert (concat
+           "{\\rtf1\\ansi{\\fonttbl\\f1\\fmodern " ess-sas-rtf-font-name ";}\n"
+           "\\margl720\\margr720\\margt720\\margb720\n"
+           
"{\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;\\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;\\red0\\green0\\blue128;\\red0\\green128\\blue128;\\red0\\green128\\blue0;\\red128\\green0\\blue128;\\red128\\green0\\blue0;\\red128\\green128\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\n"
+           "{\\stylesheet{\\s15\\plain\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs 
Text;}{\\*\\cs16 \\additive\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs Base Style;}}\n"
+           
"{\\plain\\s15{\\cs16\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024{\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024\n"))
+  (goto-char (point-max))
+  (insert "}}}}\n")
+  (save-buffer)
+  (kill-buffer (current-buffer)))
 
 (defun ess-rtf-replace-chars ()
   "Convert a text file to an MS RTF file."
@@ -912,28 +907,24 @@ optional argument is non-nil, then set-buffer rather than 
switch."
   "Creates an MS RTF landscape file from the current buffer."
   (interactive)
   (ess-revert-wisely)
-
   (set-visited-file-name (concat (buffer-name) ".rtf"))
-
-  (if 'buffer-read-only (setq buffer-read-only nil)) ;FIXME: Why quoted?
-    (ess-rtf-replace-chars)
-
-    (goto-char (point-min))
-            (insert (concat
-             "{\\rtf1\\ansi{\\fonttbl\\f1\\fmodern " ess-sas-rtf-font-name 
";}\n"
-             "\\margl720\\margr720\\margt720\\margb720\n"
-            "{\\*\\pgdsctbl\n"
-            
"{\\pgdsc0\\pgdscuse195\\lndscpsxn\\pgwsxn15840\\pghsxn12240\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\pgdscnxt0
 Default;}}\n"
-            
"\\landscape\\paperh12240\\paperw15840\\margl1800\\margr1800\\margt1440\\margb1440\\sectd\\sbknone\\lndscpsxn\\pgwsxn15840\\pghsxn12240\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\ftnbj\\ftnstart1\\ftnrstcont\\ftnnar\\aenddoc\\aftnrstcont\\aftnstart1\\aftnnrlc\n"
-             
"{\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;\\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;\\red0\\green0\\blue128;\\red0\\green128\\blue128;\\red0\\green128\\blue0;\\red128\\green0\\blue128;\\red128\\green0\\blue0;\\red128\\green128\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\n"
-             "{\\stylesheet{\\s15\\plain\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs 
Text;}{\\*\\cs16 \\additive\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs Base Style;}}\n"
-             
"{\\plain\\s15{\\cs16\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024{\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024\n"))
-
-    (goto-char (point-max))
-    (insert "}}}}\n")
-
-    (save-buffer)
-    (kill-buffer (current-buffer)))
+  (when buffer-read-only
+    (setq buffer-read-only nil))
+  (ess-rtf-replace-chars)
+  (goto-char (point-min))
+  (insert (concat
+           "{\\rtf1\\ansi{\\fonttbl\\f1\\fmodern " ess-sas-rtf-font-name ";}\n"
+           "\\margl720\\margr720\\margt720\\margb720\n"
+          "{\\*\\pgdsctbl\n"
+          
"{\\pgdsc0\\pgdscuse195\\lndscpsxn\\pgwsxn15840\\pghsxn12240\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\pgdscnxt0
 Default;}}\n"
+          
"\\landscape\\paperh12240\\paperw15840\\margl1800\\margr1800\\margt1440\\margb1440\\sectd\\sbknone\\lndscpsxn\\pgwsxn15840\\pghsxn12240\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\ftnbj\\ftnstart1\\ftnrstcont\\ftnnar\\aenddoc\\aftnrstcont\\aftnstart1\\aftnnrlc\n"
+           
"{\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;\\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;\\red0\\green0\\blue128;\\red0\\green128\\blue128;\\red0\\green128\\blue0;\\red128\\green0\\blue128;\\red128\\green0\\blue0;\\red128\\green128\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\n"
+           "{\\stylesheet{\\s15\\plain\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs 
Text;}{\\*\\cs16 \\additive\\f1\\fs16\\cf1\\cb8\\lang1024 Emacs Base Style;}}\n"
+           
"{\\plain\\s15{\\cs16\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024{\\cs16\\f1\\fs16\\cf1\\cb8\\lang1024\n"))
+  (goto-char (point-max))
+  (insert "}}}}\n")
+  (save-buffer)
+  (kill-buffer (current-buffer)))
 
 (defun ess-sas-rtf-us-landscape ()
   "Creates an MS RTF US landscape file from the current buffer."